From bd49374ca6efad79b97d891882b05b8568f10fb4 Mon Sep 17 00:00:00 2001
From: MrKomodoDragon <74436682+MrKomodoDragon@users.noreply.github.com>
Date: Thu, 4 Mar 2021 14:39:47 -0800
Subject: Remove arrows (whoopsies)!

---
 bot/constants.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index f6e09ae7..b8e30a7c 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -158,12 +158,9 @@ class Colours:
     soft_orange = 0xf9cb54
     soft_red = 0xcd6d6d
     yellow = 0xf9f586
-<<<<<<< master
     python_blue = 0x4B8BBE
     python_yellow = 0xFFD43B
-=======
     grass_green = 0x66ff00
->>>>>>> master
 
 
 class Emojis:
-- 
cgit v1.2.3