From b8cdf059218b8513fcb793ea3fd1cfde82b345ab Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Mon, 19 Mar 2018 14:15:47 +0100
Subject: [PATCH] gitignore

---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed8f93c683..5f3c9db7f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 *.swp
 *.swo
 vendor
@@ -10,8 +11,6 @@ examples/basecoin/glide.lock
 examples/basecoin/app/data
 baseapp/data/*
 docs/_build
-<<<<<<< HEAD
-<<<<<<< HEAD
 .DS_Store
 coverage.txt
 profile.out