@@ -1,4 +1,3 @@
-<<<<<<< HEAD
lib/test.html
lib/postdata.json
lib/nextpage.json
@@ -25,8 +24,4 @@ data/captcha/birds/
data/captcha/fumo_plushies/
data/captcha/minecraft/
!banner/*default*
-=======
-banner/*
-!banner/*default*
->>>>>>> 77293818cd213ec0ad07c573d298fff9cd5b357d
scraper/curlie.html
Felix Freeman