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

[core.git] / framework / main / classes / states / class_BaseState.php

diff --git a/framework/main/classes/states/class_BaseState.php b/framework/main/classes/states/class_BaseState.php
index 5c7945dbf94a469b89d5e29dd6737a3e6f471cd4..820f31c385e2d6018512b91c1ac258935cf7388f 100644 (file)
--- a/framework/main/classes/states/class_BaseState.php
+++ b/framework/main/classes/states/class_BaseState.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\State\Stateable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/states/class_BaseState.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/states/class_BaseState.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *