1 files changed, 38 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 099a5c0..1f38349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,42 @@
+<<<<<<< HEAD
 syntax: glob
 
 *.pyc
 *~
+=======
+*.py[cod]
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+>>>>>>> 2f856c6503ca4ede2d0853470326731620232557