+ fix import

2020-12-26 15:57:46 +01:00
parent 553c7def0e 351dc2e6d0
commit 33530da119
2 changed files with 5 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
 __pycache__/
 res/output/
+<<<<<<< HEAD
 res/input/*
 .vscode/*
 *.json
+=======
+res/input/
+>>>>>>> 351dc2e6d0158a1b81601f48503f761ea4995e58
 *.pyc
 *.png
 debug.py