Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / loader / class_ClassLoader.php

diff --git a/framework/loader/class_ClassLoader.php b/framework/loader/class_ClassLoader.php
index 3fd420fa11d62c2d963b94eba70aa8b2a7af1960..fab4e559a640c56363f79845b2d64fffaa42ce80 100644 (file)
--- a/framework/loader/class_ClassLoader.php
+++ b/framework/loader/class_ClassLoader.php
@@ -16,13 +16,8 @@ use \SplFileInfo;
  * This class loads class include files with a specific prefix and suffix
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
-<<<<<<< HEAD:framework/loader/class_ClassLoader.php
  * @version            1.5.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/loader/class_ClassLoader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *