Ignores build files and updated mongo URI

2017-05-02 10:17:28 -05:00
parent 3319a2d6d7
commit f313f7ca24
2 changed files with 7 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
+<<<<<<< Updated upstream
 env/*
 pocwww.egg*
+=======
+
+env/*
+pocwww.egg-info/*
+>>>>>>> Stashed changes