From d746fabb6bfc23f110386426c3cd89a922795c6d Mon Sep 17 00:00:00 2001
From: reoccurcat <reoccurcat@gmail.com>
Date: Fri, 3 Jun 2022 11:57:04 -0500
Subject: [PATCH] idk what happened here but fixed it

---
 .env.template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.env.template b/.env.template
index 602769c..5ab4ae4 100644
--- 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=""