X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fhelper%2Fclass_FormClosedException.php;h=396ee34dbffad5deacd48b841193b54fcf7a7b17;hp=be2d4b8d8697bdafe045a77b7a7a973bf350a1ff;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/exceptions/helper/class_FormClosedException.php b/framework/main/exceptions/helper/class_FormClosedException.php
index be2d4b8d..396ee34d 100644
--- a/framework/main/exceptions/helper/class_FormClosedException.php
+++ b/framework/main/exceptions/helper/class_FormClosedException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_FormClosedException.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_FormClosedException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @deprecated	Don't use this anymore