idk what happened here but fixed it

3 years ago · d746fabb6b
parent 8f6672d9f5
commit d746fabb6b
1 changed files with 0 additions and 3 deletions
--- a/.env.template
+++ b/.env.template
@ -6,9 +6,6 @@ REDDIT_PASSWORD=""
 # Valid options are "yes" and "no" for the variable below
 REDDIT_2FA=""

-<<<<<<< HEAD
-=======
 THEME=""

->>>>>>> 64fa33fd482ef63e8a75cca1a438a37e078aee48
 SUBREDDIT=""