X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Fdiscovery%2Fclass_;fp=framework%2Fmain%2Fclasses%2Fdiscovery%2Fclass_;h=baf610f97411e14da2666d17cac2d9b53240b323;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=f33d64f003a064d4432e43aad004365a26164075;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

diff --git a/framework/main/classes/discovery/class_ b/framework/main/classes/discovery/class_
index f33d64f0..baf610f9 100644
--- a/framework/main/classes/discovery/class_
+++ b/framework/main/classes/discovery/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/discovery/class_
  * @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/discovery/class_
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *