Merge remote-tracking branch 'refs/remotes/SteamingMutt/master'

# Conflicts: # discord_bot.js
Dougley · Dec 4, 2015 · 5dd7376 · 5dd7376
2 parents 1207a41 + b521cde
commit 5dd7376
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/discord_bot.js b/discord_bot.js
@@ -10,7 +10,11 @@ var VersionChecker	= require("./versioncheck");
 
 var maintenance;
 
+<<<<<<< HEAD
 var version = "1.2.10";
+=======
+var version = "1.2.9";
+>>>>>>> refs/remotes/SteamingMutt/master
 
 var Discord = require("discord.js");