updates

m-jora · Nov 9, 2020 · d86b595 · d86b595
2 parents 9d81ce9 + 7399781
commit d86b595
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/bot.py b/bot.py
@@ -15,7 +15,7 @@
 intents = discord.Intents(guilds = True, members = True, emojis = True, messages = True, reactions = True, typing = True)
 
 load_dotenv()
-TOKEN = os.getenv('DISCORD_TOKEN') #obtains bot token from .env file
+TOKEN = os.getenv('IKA_TOKEN') #obtains bot token from .env file
 
 bot = commands.Bot(command_prefix = ('m.', '<@!705683895055679521>', '<@!705683895055679521> ', 'M.'), intents = intents)
 bot.remove_command('help')

diff --git a/json/dog.json b/json/dog.json
@@ -1,3 +1,7 @@
 {
+<<<<<<< HEAD
   "775447777156136980": 0
+=======
+  "771909342517002280": 0
+>>>>>>> 739978197793a4986766bc923385faf2043e6cdd
 }