From 599d757b6b7b29c871dcc737027afae485561941 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 28 Jan 2015 10:10:34 +0000
Subject: [PATCH] Fix merge conflict

---
 src/Core/Start.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Core/Start.php b/src/Core/Start.php
index b180596d..1cf91de1 100644
--- a/src/Core/Start.php
+++ b/src/Core/Start.php
@@ -89,13 +89,8 @@ private function addAppAutoloader($appNamespace) {
 		Path::get(Path::SRC),
 		"Class",
 	]));
-<<<<<<< HEAD
 
 	if(is_dir($classDir)) {
-		// By default load classes within the Class/ directory.
-=======
-	if(is_dir($classDir)) {
->>>>>>> 90e3dcffd85a768b9891803da0ca793d88304391
 		$loader->addPsr4($appNamespace . "\\", $classDir);
 	}