Fix merge conflict

PhpGt · Jan 28, 2015 · 599d757 · 599d757
1 parent 083e2b8
commit 599d757
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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);
 	}