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

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

diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
index afd49a54872f4f7e9cbe978f792c734778f65ea3..116e474d8ea96bb4a0b8de2487424a26c6b009af 100644 (file)
--- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.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_PaymentsDatabaseWrapper.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_PaymentsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Add missing own interface for public methods