Continued:

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

diff --git a/framework/main/exceptions/helper/class_InvalidFormNameException.php b/framework/main/exceptions/helper/class_InvalidFormNameException.php
index c58711d3e33112a3b05f0b10ed439e03bcb196e6..af4f00609caaf50cbba23e3ac826a1c7ccd60dab 100644 (file)
--- a/framework/main/exceptions/helper/class_InvalidFormNameException.php
+++ b/framework/main/exceptions/helper/class_InvalidFormNameException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_InvalidFormNameException.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_InvalidFormNameException.php
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore