Merge

.gitignore

@@ -2,13 +2,24 @@
 __pycache__/
 *.py[cod]
 *$py.class
+<<<<<<< HEAD
 test_re.py
+=======
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a
 
 # C extensions
 *.so
 
+<<<<<<< HEAD
 # Distribution / packaging
 .Python
+=======
+./idea
+data/
+# Distribution / packaging
+.Python
+env/
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a
 build/
 develop-eggs/
 dist/
@@ -43,7 +54,11 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+<<<<<<< HEAD
 *.cover
+=======
+*,cover
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a
 .hypothesis/
 
 # Translations
@@ -52,7 +67,10 @@ coverage.xml
 
 # Django stuff:
 *.log
+<<<<<<< HEAD
 local_settings.py
+=======
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a
 
 # Flask stuff:
 instance/
@@ -79,22 +97,37 @@ celerybeat-schedule
 # SageMath parsed files
 *.sage.py
 
+<<<<<<< HEAD
 # Environments
 .env
 .venv
 env/
+=======
+# dotenv
+.env
+
+# virtualenv
+.venv
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a
 venv/
 ENV/
 
 # Spyder project settings
 .spyderproject
+<<<<<<< HEAD
 .spyproject
+=======
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a
 
 # Rope project settings
 .ropeproject
 
 # mkdocs documentation
 /site
+<<<<<<< HEAD
 
 # mypy
 .mypy_cache/
+=======
+.idea/
+>>>>>>> 1fee85ff8c34e0329a72d6ca0f492b183022647a