Conflict resolved

CCampJr · May 20, 2019 · f1afcc8 · f1afcc8
2 parents 57e6457 + 4378b2f
commit f1afcc8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,7 +49,11 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+<<<<<<< HEAD
 .pytest_cache/
+=======
+.pytest_cache/*
+>>>>>>> master
 
 # Translations
 *.mo