summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorFelix Freeman <libsys@hacktivista.org>2024-06-26 09:29:46 -0400
committerFelix Freeman <libsys@hacktivista.org>2024-06-26 09:29:46 -0400
commitd509effb30b9a93685d9d609a47ec92549c7b7cc (patch)
treeba12c5f3a914976d174d790469183779ea2d2a0e /.gitignore
parent77931f3ee9b2a51d83b05752b3d98638b30cae38 (diff)
Clean .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 0 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 6c541bd..7c20c0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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