Some updates:

[core.git] / framework / main / interfaces / resolver / actions / class_ActionResolver.php

diff --git a/framework/main/interfaces/resolver/actions/class_ActionResolver.php b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
index 80f06b9cdfbd9802369de90c6986027f3acc87c3..3af3fe2273df66ae0160fc5fba5b9e53db078da2 100644 (file)
--- a/framework/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/framework/main/interfaces/resolver/actions/class_ActionResolver.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/actions/class_ActionResolver.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/actions/class_ActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *