Compare commits
3
Commits
77931f3ee9
...
b98a393421
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b98a393421 | ||
|
|
cb4d933467 | ||
|
|
d509effb30 |
+1
-5
@@ -1,4 +1,3 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
lib/test.html
|
lib/test.html
|
||||||
lib/postdata.json
|
lib/postdata.json
|
||||||
lib/nextpage.json
|
lib/nextpage.json
|
||||||
@@ -25,8 +24,5 @@ data/captcha/birds/
|
|||||||
data/captcha/fumo_plushies/
|
data/captcha/fumo_plushies/
|
||||||
data/captcha/minecraft/
|
data/captcha/minecraft/
|
||||||
!banner/*default*
|
!banner/*default*
|
||||||
=======
|
|
||||||
banner/*
|
|
||||||
!banner/*default*
|
|
||||||
>>>>>>> 77293818cd213ec0ad07c573d298fff9cd5b357d
|
|
||||||
scraper/curlie.html
|
scraper/curlie.html
|
||||||
|
icons/*
|
||||||
Reference in new issue
Block a user