Some updates:

[core.git] / framework / main / interfaces / resolver / controller / class_ControllerResolver.php

diff --git a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
index daac133cb69518314e15994142141f42bbafbb45..99777c04cd81dd98ae9e32fcecc87e460d7a8551 100644 (file)
--- a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/controller/class_ControllerResolver.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/interfaces/resolver/controller/class_ControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *