.

2021-02-14 10:40:34 +00:00
parent 12f8f64175
commit c8020bdba0
3 changed files with 5 additions and 5 deletions
@@ -207,7 +207,3 @@ try:
    from .settings_local import *
 except ImportError:
    pass
-<<<<<<< HEAD
-=======
-
->>>>>>> 5763aae287cbceee318f975495f7d9429517c88f