Initial commit

.gitignore

@@ -1,25 +1,39 @@
+<<<<<<< HEAD
 # ---> Python
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
+=======
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+>>>>>>> Initial commit
 
 # C extensions
 *.so
 
 # Distribution / packaging
 .Python
+<<<<<<< HEAD
+=======
+env/
+>>>>>>> Initial commit
 build/
 develop-eggs/
 dist/
 downloads/
 eggs/
+<<<<<<< HEAD
 .eggs/
+=======
+>>>>>>> Initial commit
 lib/
 lib64/
 parts/
 sdist/
 var/
+<<<<<<< HEAD
 wheels/
 pip-wheel-metadata/
 share/python-wheels/
@@ -27,6 +41,11 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+=======
+*.egg-info/
+.installed.cfg
+*.egg
+>>>>>>> Initial commit
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -41,6 +60,7 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+<<<<<<< HEAD
 .nox/
 .coverage
 .coverage.*
@@ -51,6 +71,12 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
+=======
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+>>>>>>> Initial commit
 
 # Translations
 *.mo
@@ -58,6 +84,7 @@ coverage.xml
 
 # Django stuff:
 *.log
+<<<<<<< HEAD
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
@@ -68,12 +95,15 @@ instance/
 
 # Scrapy stuff:
 .scrapy
+=======
+>>>>>>> Initial commit
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
 target/
+<<<<<<< HEAD
 
 # Jupyter Notebook
 .ipynb_checkpoints
@@ -145,3 +175,5 @@ dmypy.json
 **/IntegrationServer/XAStore/
 **/IntegrationServer/packages/Wm*/
 
+=======
+>>>>>>> Initial commit