Parser-Methoden 1

2014-04-03 12:26:04 +02:00
parent 4627c052fb
commit a866505316
1 changed files with 1 additions and 2 deletions
--- 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
+
 	}
 }