Some updates:

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

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