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

[core.git] / framework / main / exceptions / helper / class_FormGroupClosedException.php

diff --git a/framework/main/exceptions/helper/class_FormGroupClosedException.php b/framework/main/exceptions/helper/class_FormGroupClosedException.php
index 3c3dc740c28f96ca7fd6af354162e66d8f09e059..f45c8f1e592b9766446048ad41812d82a82b1a57 100644 (file)
--- a/framework/main/exceptions/helper/class_FormGroupClosedException.php
+++ b/framework/main/exceptions/helper/class_FormGroupClosedException.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/helper/class_FormGroupClosedException.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/helper/class_FormGroupClosedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore