From a8d720bf414fa1cc46007deb9e40868a433ac05b Mon Sep 17 00:00:00 2001
From: Perpetucake <perpetucake@gmail.com>
Date: Fri, 4 Dec 2015 13:49:29 -0600
Subject: [PATCH] ...wat

ok
---
 discord_bot.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/discord_bot.js b/discord_bot.js
index c7c8bfe..edcb4e7 100644
--- 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");