update .gitignore

Merge branch 'master' of https://github.com/eyyi/dymrl
rlutes · Nov 8, 2016 · 9f71c38 · 9f71c38
2 parents 1718d1e + c306d9b
commit 9f71c38
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -108,3 +108,7 @@ pip-selfcheck.json
 
 # User-specific stuff:
 .idea/
+<<<<<<< HEAD
+=======
+examples/__init__.py
+>>>>>>> c306d9b3b8535a422334862057210ef4c008e518