diff options
| author | lolcat <will@lolcat.ca> | 2024-06-27 02:59:08 +0000 |
|---|---|---|
| committer | lolcat <will@lolcat.ca> | 2024-06-27 02:59:08 +0000 |
| commit | b98a39342103816fe260a9c7c9fd4adf058895c8 (patch) | |
| tree | 9aabbec8f045fa8352a240ab2782897b5c95f339 /.gitignore | |
| parent | 77931f3ee9b2a51d83b05752b3d98638b30cae38 (diff) | |
| parent | cb4d9334673fc80086efcc36a44872255ed42393 (diff) | |
Merge pull request 'Clean .gitignore and ignore icons/*' (#25) from libsys/4get:master into master
Reviewed-on: https://git.lolcat.ca/lolcat/4get/pulls/25
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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/* |