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

[core.git] / framework / main / exceptions / state / class_UnresolveableStateException.php

diff --git a/framework/main/exceptions/state/class_UnresolveableStateException.php b/framework/main/exceptions/state/class_UnresolveableStateException.php
index 62fa1374ff88654a3da79307f7e3abababe30511..36b3c0a393ac6c78e4eebf8d9c91a6f6285cc41e 100644 (file)
--- a/framework/main/exceptions/state/class_UnresolveableStateException.php
+++ b/framework/main/exceptions/state/class_UnresolveableStateException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/state/class_UnresolveableStateException.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/exceptions/state/class_UnresolveableStateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *