Some updates:

[core.git] / framework / main / classes / reader / class_DefaultNewsReader.php

diff --git a/framework/main/classes/reader/class_DefaultNewsReader.php b/framework/main/classes/reader/class_DefaultNewsReader.php
index a79102bf1d745756466d4f53a44cc5135b8c9c3b..b988f43ef867e9de7c7ef9aff6dc1c744718b60a 100644 (file)
--- a/framework/main/classes/reader/class_DefaultNewsReader.php
+++ b/framework/main/classes/reader/class_DefaultNewsReader.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/reader/class_DefaultNewsReader.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/classes/reader/class_DefaultNewsReader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *