From 51a8fdda5b75e5aff66fa30713a634ad89763fea Mon Sep 17 00:00:00 2001
From: MallocNull <aleco@aroltd.com>
Date: Sun, 19 Oct 2014 16:07:35 -0500
Subject: [PATCH] github a shit

fuck
---
 bot/bot/Chat.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bot/bot/Chat.cs b/bot/bot/Chat.cs
index 4eef4a3..fccfac8 100644
--- a/bot/bot/Chat.cs
+++ b/bot/bot/Chat.cs
@@ -17,7 +17,6 @@ namespace bot {
         static int currentMessage;
 
         public static void reloadContext(FirefoxDriver d) {
-<<<<<<< HEAD
 			while(true) {
 				try {
 					List<IWebElement> chatdata = d.FindElement(By.Id("chatList")).FindElements(By.TagName("div")).ToList();
@@ -29,14 +28,12 @@ namespace bot {
 					break;
 				} catch(Exception shoehorn) {}
 			}
-=======
             List<IWebElement> chatdata = d.FindElement(By.Id("chatList")).FindElements(By.TagName("div")).ToList();
             messageDivSize = chatdata.Count;
             foreach(IWebElement we in chatdata) {
                 if(Int32.Parse(we.GetAttribute("id").Substring(we.GetAttribute("id").LastIndexOf('_') + 1)) > currentMessage)
                     currentMessage = Int32.Parse(we.GetAttribute("id").Substring(we.GetAttribute("id").LastIndexOf('_') + 1));
             }
->>>>>>> origin/master
             if(d.FindElement(By.Id("audioButton")).GetAttribute("class").ToLower() == "button")
                 d.FindElement(By.Id("audioButton")).Click();
         }