From 20217be743aad2b7e2d30e608304eb1fc921c9da Mon Sep 17 00:00:00 2001
From: BlockArchitech <gibbiemonster4@gmail.com>
Date: Fri, 3 Jun 2022 13:22:23 -0400
Subject: [PATCH] resolve gitignore conflict

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b85be09..6cf136b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,7 @@ assets/
 reddit/__pycache__/
 utils/__pycache__/
 .env
-<<<<<<< HEAD
 reddit-bot-351418-5560ebc49cac.json
 video_creation/__pycache__/
 .setup-done-before
-||||||| 5b39896
-reddit-bot-351418-5560ebc49cac.json
-=======
-reddit-bot-351418-5560ebc49cac.json
 __pycache__
->>>>>>> 6fc5d2a7377dfe9f65d0d011fc260602527847c9