Some updates:

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

diff --git a/framework/main/classes/controller/html/class_HtmlLoginController.php b/framework/main/classes/controller/html/class_HtmlLoginController.php
index d643b9dd60d19c33f43ffd267d7e58894c2c906f..5170d4ca9e75cbb64dc2564a8aa96222660f2a30 100644 (file)
--- 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
  *