1 files changed, 2 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 78840ac..1801530 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
-<<<<<<< HEAD
 ebin
 deps
 .eunit
 *.o
 *.beam
 *.plt
+*.pyc
+*~
 erl_crash.dump
 rel/example_project
 .concrete/DEV_MODE