X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlLoginController.php;h=5170d4ca9e75cbb64dc2564a8aa96222660f2a30;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=d643b9dd60d19c33f43ffd267d7e58894c2c906f;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74;p=core.git

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