From c84a701ce071866e0f6ea7e3f81217b43682816d Mon Sep 17 00:00:00 2001
From: The-Drobe <Giles@wardr0be.me>
Date: Mon, 6 Jun 2022 17:20:49 +0800
Subject: [PATCH] commit

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

diff --git a/.gitignore b/.gitignore
index 15da733..2e48a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,9 @@ reddit-bot-351418-5560ebc49cac.json
 video_creation/__pycache__/
 .setup-done-before
 __pycache__
-<<<<<<< HEAD
 out
 venv
 old
-=======
 .idea/
 .DS_Store
 out
->>>>>>> cf6b3a9c44d86909f585a3111d62005cd05c8f7d