css fix; url fix

2017-11-13 19:40:30 +01:00
parent 2974480b83 7f3f08c65c
commit 1c25fe6502
6 changed files with 117 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@ node_modules
 crawler/build
 backend/build
 npm-debug.log
+<<<<<<< HEAD
 crawler.out
+=======
+crawler.log
+>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c