forked from lolcat/4get
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
This commit is contained in:
commit
d3fe37e7b6
|
@ -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/*
|
||||||
|
|
Loading…
Reference in New Issue