From 6cf9eb0de1f6a4bee6655ada346f96d4ae5c21af Mon Sep 17 00:00:00 2001
From: hanemile <mail@emile.space>
Date: Sun, 19 Jul 2020 16:51:20 +0200
Subject: removed merge conflicts

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b01c693..8fc0d80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-./uploads/*
-=======
 uploads/
->>>>>>> refs/remotes/origin/master
-- 
cgit 1.4.1