From 5a9c3f259a57c3d3e7f3b8b8b421ca2f5e45d890 Mon Sep 17 00:00:00 2001
From: Yorick <yorick-rommers@hotmail.com>
Date: Tue, 7 Apr 2015 12:12:42 +0200
Subject: [PATCH] oops

---
 Objects/DrawObject.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Objects/DrawObject.java b/Objects/DrawObject.java
index 706447e..22e5c7c 100644
--- a/Objects/DrawObject.java
+++ b/Objects/DrawObject.java
@@ -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