summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlolcat <will@lolcat.ca>2024-06-29 12:55:44 -0400
committerlolcat <will@lolcat.ca>2024-06-29 12:55:44 -0400
commitd3fe37e7b62d825862f7fbfc75affa0ec19b153d (patch)
tree765afdfba57e2b518045f029d715f74090b6a1c8
parente252bf4fce70c56b33294fdd095b0dc08ce8b95f (diff)
parentb98a39342103816fe260a9c7c9fd4adf058895c8 (diff)
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
-rw-r--r--.gitignore6
1 files changed, 1 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 6c541bd..134e1b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
lib/test.html
lib/postdata.json
lib/nextpage.json
@@ -25,8 +24,5 @@ data/captcha/birds/
data/captcha/fumo_plushies/
data/captcha/minecraft/
!banner/*default*
-=======
-banner/*
-!banner/*default*
->>>>>>> 77293818cd213ec0ad07c573d298fff9cd5b357d
scraper/curlie.html
+icons/*