Some updates:

[core.git] / framework / main / interfaces / resolver / commands / class_CommandResolver.php

diff --git a/framework/main/interfaces/resolver/commands/class_CommandResolver.php b/framework/main/interfaces/resolver/commands/class_CommandResolver.php
index 87f56a60a93260665b5d4b5d9a33c101af5a7de1..967b50228ba172719d64ed34c81cead40c3f0de4 100644 (file)
--- a/framework/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/framework/main/interfaces/resolver/commands/class_CommandResolver.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/commands/class_CommandResolver.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/commands/class_CommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *