From 1d870bf2385d97ba5e277d0726a20bb2013b5862 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 3 Sep 2020 12:01:26 +0200
Subject: [PATCH] chg: [restore] file

---
 objects/keybase-account/definition.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json
index ce9f1fb..298ecdc 100644
--- a/objects/keybase-account/definition.json
+++ b/objects/keybase-account/definition.json
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 {
 	"name": "keybase-account",
     "meta-category": "",
@@ -50,4 +48,3 @@
 		}
 	}
 }
->>>>>>> parent of 3224f78... added description field in attributes