aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorlolcat <will@lolcat.ca>2023-09-03 22:44:46 -0400
committerlolcat <will@lolcat.ca>2023-09-03 22:44:46 -0400
commitbef83bb3c8819532b1728d642913f5a4c41ab324 (patch)
tree0e4eb1e812e8ecf5285dba7bc36e50509cc32973 /.gitignore
parentc8ab934b108c83a391583ea8ae7f717c9753926e (diff)
parent77293818cd213ec0ad07c573d298fff9cd5b357d (diff)
readme
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2930bc8..7498cf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
lib/test.html
lib/postdata.json
lib/nextpage.json
@@ -21,3 +22,7 @@ scraper/soundcloud.json
scraper/mp3-pm.html
banner/*
!banner/*default*
+=======
+banner/*
+!banner/*default*
+>>>>>>> 77293818cd213ec0ad07c573d298fff9cd5b357d
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage