...wat

ok
Dougley · Dec 4, 2015 · a8d720b · a8d720b
1 parent 5dd7376
commit a8d720b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/discord_bot.js b/discord_bot.js
@@ -10,11 +10,7 @@ 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");