Compare commits
No commits in common. "b98a39342103816fe260a9c7c9fd4adf058895c8" and "77931f3ee9b2a51d83b05752b3d98638b30cae38" have entirely different histories.
b98a393421
...
77931f3ee9
|
@ -1,3 +1,4 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
lib/test.html
|
lib/test.html
|
||||||
lib/postdata.json
|
lib/postdata.json
|
||||||
lib/nextpage.json
|
lib/nextpage.json
|
||||||
|
@ -24,5 +25,8 @@ 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/*
|
|
||||||
|
|
Loading…
Reference in New Issue