1 files changed, 42 insertions, 21 deletions
diff --git a/include/World.h b/include/World.h
index e405059..dd133b9 100644
--- a/include/World.h
+++ b/include/World.h
@@ -1,21 +1,42 @@
-#ifndef WORLD_H
-#define WORLD_H
-
-#include <common.h>
-
-#define HLINE (2.0f/(SCREEN_WIDTH/4))
-
-class World {
-private:
-	struct line_t {
-		// x = 2.0 (window width) / HLINES
-		double start; // Where to change to dirt, going down (y)
-	} *line;
-	unsigned int lineCount;
-public:
-	World(float width);
-	void draw(void);
-	void detect(vec2 *v,const float width);
-};
-
-#endif // WORLD_H
+<<<<<<< HEAD
+#ifndef WORLD_H
+#define WORLD_H
+
+#include <common.h>
+
+class World {
+private:
+	struct line_t {
+		// x = 2.0 (window width) / HLINES
+		float start; // Where to change to dirt, going down (y)
+	} *line;
+	unsigned int lineCount;
+public:
+	World(float width);
+	void draw(void);
+};
+
+#endif // WORLD_H
+=======
+#ifndef WORLD_H
+#define WORLD_H
+
+#include <common.h>
+
+#define HLINE (2.0f/(SCREEN_WIDTH/4))
+
+class World {
+private:
+	struct line_t {
+		// x = 2.0 (window width) / HLINES
+		double start; // Where to change to dirt, going down (y)
+	} *line;
+	unsigned int lineCount;
+public:
+	World(float width);
+	void draw(void);
+	void detect(vec2 *v,const float width);
+};
+
+#endif // WORLD_H
+>>>>>>> origin/master