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

[core.git] / framework / main / classes / class_FrameworkArrayObject.php

diff --git a/framework/main/classes/class_FrameworkArrayObject.php b/framework/main/classes/class_FrameworkArrayObject.php
index 8d68eaba653339ee862f39568fd89f026ab3997f..a75c861accd0b614940c42f0ff1b262368217595 100644 (file)
--- a/framework/main/classes/class_FrameworkArrayObject.php
+++ b/framework/main/classes/class_FrameworkArrayObject.php
@@ -12,11 +12,7 @@ use \ArrayObject;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/class_FrameworkArrayObject.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/class_FrameworkArrayObject.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *