Merge pull request 'Clean .gitignore and ignore icons/*' (#25 ) from libsys/4get:master into master

Reviewed-on: #25
Ignore files in icons/
2024-06-27 02:59:08 +00:00 · 2024-06-26 19:09:58 -04:00 · 2024-06-26 09:29:46 -04:00
1 changed files with 1 additions and 5 deletions
--- 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/*
Author	SHA1	Message	Date
lolcat	b98a393421	Merge pull request 'Clean .gitignore and ignore icons/*' (#25 ) from libsys/4get:master into master Reviewed-on: #25	2024-06-27 02:59:08 +00:00
Felix Freeman	cb4d933467	Ignore files in icons/	2024-06-26 19:09:58 -04:00
Felix Freeman	d509effb30	Clean .gitignore	2024-06-26 09:29:46 -04:00