Some updates:

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

diff --git a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index cbc46d0b961d29c8e1779dab6f166ba4ab733a52..3a79138c35eccab595f9bdba5af6bf7a1060d2a1 100644 (file)
--- a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -16,7 +16,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.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/resolver/controller/html/class_HtmlControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *