1 files changed, 0 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 78840ac..6e84a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
-<<<<<<< HEAD
 ebin
-deps
 .eunit
 *.o
 *.beam