X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fdiscovery%2Fclass_Discoverable.php;h=7c906f09ad448ea09a6e261d446879c337fafc13;hb=HEAD;hp=88e8a4fd182fc8ed0243057dfe41579aac85726e;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/interfaces/discovery/class_Discoverable.php b/framework/main/interfaces/discovery/class_Discoverable.php
index 88e8a4fd..072cffdd 100644
--- a/framework/main/interfaces/discovery/class_Discoverable.php
+++ b/framework/main/interfaces/discovery/class_Discoverable.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/discovery/class_Discoverable.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/discovery/class_Discoverable.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *