css fix, url fix

2017-11-13 19:46:26 +01:00
parent 1c25fe6502
commit 02410a8c3c
5 changed files with 0 additions and 117 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,3 @@ node_modules
 crawler/build
 backend/build
 npm-debug.log
-<<<<<<< HEAD
-crawler.out
-=======
-crawler.log
->>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c