X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fhelper%2Fclass_InvalidFormNameException.php;fp=framework%2Fmain%2Fexceptions%2Fhelper%2Fclass_InvalidFormNameException.php;h=596633738edadf4003a8209f4131d9b925a627d8;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=c58711d3e33112a3b05f0b10ed439e03bcb196e6;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

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