From a8665053161941ef05204ff1abf0b02c56d2b9fd Mon Sep 17 00:00:00 2001
From: Samed Bektas <samed2004@hotmail.com>
Date: Thu, 3 Apr 2014 12:26:04 +0200
Subject: [PATCH] Parser-Methoden 1

---
 src/Parser.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Parser.cs b/src/Parser.cs
index b55111f..4603269 100644
--- a/src/Parser.cs
+++ b/src/Parser.cs
@@ -4,7 +4,6 @@ namespace WorldOfPeacecraft
 {
 	public class Parser
 	{
-<<<<<<< HEAD
 				
         public void setMe()
         {
@@ -108,7 +107,7 @@ namespace WorldOfPeacecraft
 		public void convertOutgoing(string toServer){
 
 		}
->>>>>>> 20a88c29d15ed7cb5318dad8ce3edaec3e278b0e
+
 	}
 }