Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / database / frontend / class_NewsDatabaseWrapper.php

diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index 20874d8a7be25d7706d6d1541b216ef456807b41..88b98cbd05cafc4fae01ed8ad8d2bf78d9c38740 100644 (file)
--- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/frontend/class_NewsDatabaseWrapper.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/database/frontend/class_NewsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Add missing own interface for public methods