merge's garbage fixed, definition issues solved

src/input/Keyboard.h

@@ -30,6 +30,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "KeyCode.h"
 #include "OS.h"
 
+#undef MK_SHIFT
+#undef MK_ALT
+
 namespace crown
 {
 

src/renderers/gl/GLRenderer.h

@@ -209,13 +209,9 @@ private:
 
 private:
 
-<<<<<<< HEAD
-	GLContext			m_context;
-
-	MallocAllocator		m_allocator;
-=======
 	HeapAllocator		m_allocator;
->>>>>>> master
+
+	GLContext			m_context;
 
 	// Matrices
 	Mat4				m_matrix[MT_COUNT];