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

[core.git] / framework / main / classes / controller / html / form / class_HtmlDoFormController.php

diff --git a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
index f4a4479cd4fd513982fd3ab1b5ee16c61e904a71..fad03b89a49de33a714f21342d9dc72ec4a87480 100644 (file)
--- a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
+++ b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/form/class_HtmlDoFormController.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/controller/html/form/class_HtmlDoFormController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *