Some updates:

[core.git] / framework / main / classes / commands / html / class_HtmlLogoutDoneCommand.php

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
index 361c9599fa53b0b5d3b2ccc1e3cea84d54231842..7a7a281d75a66debae7744d59d2168f919913400 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.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/commands/html/class_HtmlLogoutDoneCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *