oops

2015-04-07 12:12:42 +02:00
parent 3920354ae2
commit 5a9c3f259a
1 changed files with 2 additions and 2 deletions
@@ -156,7 +156,7 @@ public abstract class DrawObject
 	}

 	/**
-	 * <<<<<<< HEAD:Applicatie/DrawObject.java Method that gets all the corner
+	 * Method that gets all the corner
 	 * coordinates index: 0 -> top left 1 -> top right 3 -> bottom left 4 ->
 	 * bottom right
 	 * 
@@ -179,7 +179,7 @@ public abstract class DrawObject
 	}

 	/**
-	 * ======= >>>>>>> origin/kenneth:Objects/DrawObject.java Checking
+	 * Checking
 	 * collision.
 	 * 
 	 * @param object