diff options
| author | gesang <gesang@itinerariummentis.org> | 2024-06-29 13:58:18 +0000 |
|---|---|---|
| committer | gesang <gesang@itinerariummentis.org> | 2024-06-29 13:58:18 +0000 |
| commit | d13e228d72478745635e7a3e766cd16cc42f2e96 (patch) | |
| tree | 72da1873fb33e02272ac5c25fd6448e52f0f1d31 /.gitignore | |
| parent | 40752f5eb2b23889f444cdc6cf10c0eadd4fa11d (diff) | |
| parent | b98a39342103816fe260a9c7c9fd4adf058895c8 (diff) | |
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
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 @@ -26,8 +25,5 @@ data/captcha/fumo_plushies/ data/captcha/minecraft/ icons/* !banner/*default* -======= -banner/* -!banner/*default* ->>>>>>> 77293818cd213ec0ad07c573d298fff9cd5b357d scraper/curlie.html +icons/* |