Continued:

[core.git] / framework / main / interfaces / discovery / class_Discoverable.php

diff --git a/framework/main/interfaces/discovery/class_Discoverable.php b/framework/main/interfaces/discovery/class_Discoverable.php
index 88e8a4fd182fc8ed0243057dfe41579aac85726e..072cffdd2674b9571ee234b297311ea9740c71b9 100644 (file)
--- 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
  *