From 4a69f529c2365fb5b66bcd7660adf5c68bcb44c7 Mon Sep 17 00:00:00 2001
From: Robinson Gallego <robinson.leal7@gmail.com>
Date: Sun, 3 Nov 2019 18:25:12 -0500
Subject: [PATCH] ok

---
 src/main/resources/config.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index fadc88fd..8b814c25 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -57,15 +57,12 @@ discord:
   telnet_role_id: ''
   # Senior Admin role ID
   senior_role_id: ''
-<<<<<<< HEAD
   # Developer role ID
   developer_role_id: ''
   # Executive Admin role ID
   executive_role_id: ''
   # Owner role ID
   server_owner_role_id: ''
-
-=======
   
 # The shop
 shop:
@@ -74,7 +71,6 @@ shop:
   
   # Shop prefix
   prefix: '&7&l[&8&lTF Shop&7&l]'
->>>>>>> d582398f932330853b0456b684654da4c860e831
 
 # Admin list
 adminlist:
@@ -127,11 +123,8 @@ allow:
   unsafe_enchantments: true
   bells: true
   armorstands: false
-<<<<<<< HEAD
   minecarts: false
-=======
   clearonjoin: false
->>>>>>> d582398f932330853b0456b684654da4c860e831
 
 # Blocked commands:
 #