From d509effb30b9a93685d9d609a47ec92549c7b7cc Mon Sep 17 00:00:00 2001
From: Felix Freeman <libsys@hacktivista.org>
Date: Wed, 26 Jun 2024 09:29:46 -0400
Subject: [PATCH] Clean .gitignore

---
 .gitignore | 5 -----
 1 file changed, 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