X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=framework%2Fmain%2Finterfaces%2Fresolver%2Fclass_Resolver.php;h=2e8135cf72df414df1d697acd235f1ae4f1b8741;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=711fdc79bcc6180ef5cde6b1551b5250dd8e5385;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

diff --git a/framework/main/interfaces/resolver/class_Resolver.php b/framework/main/interfaces/resolver/class_Resolver.php
index 711fdc79..2e8135cf 100644
--- a/framework/main/interfaces/resolver/class_Resolver.php
+++ b/framework/main/interfaces/resolver/class_Resolver.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/class_Resolver.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/class_Resolver.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *