test

3 years ago · fe9e5f63e2
parent 88a128dff5
commit fe9e5f63e2
2 changed files with 1 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -140,8 +140,5 @@ cython_debug/

 .idea

-<<<<<<< HEAD
-data-dev.sqlite
-=======
+
 #data-dev.sqlite
->>>>>>> fef3cd9ced83484c0a107af79adc13a4c5d712e3
--- a/data-dev.sqlite
+++ b/data-dev.sqlite