aboutsummaryrefslogtreecommitdiffstats
path: root/bot/constants.py
diff options
context:
space:
mode:
authorGravatar MrKomodoDragon <[email protected]>2021-03-04 14:39:47 -0800
committerGravatar GitHub <[email protected]>2021-03-04 14:39:47 -0800
commitbd49374ca6efad79b97d891882b05b8568f10fb4 (patch)
tree5c21ca97eccdbf087a6b434f24e4c32afd45d947 /bot/constants.py
parentMerge branch 'master' into master (diff)
Remove arrows (whoopsies)!
Diffstat (limited to 'bot/constants.py')
-rw-r--r--bot/constants.py3
1 files changed, 0 insertions, 3 deletions
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: