X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlLoginFailedController.php;fp=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlLoginFailedController.php;h=6b9419676ec13322f97dbdade3326706a98256bd;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=696f3b1ddaf98a091eeff71648eae4b3ccc616ac;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

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