Some updates:

[core.git] / framework / main / classes / client / class_BaseClient.php

diff --git a/framework/main/classes/client/class_BaseClient.php b/framework/main/classes/client/class_BaseClient.php
index 72f9f253692f2ca339284ab7ad4d2f5b8f7529bd..79333d5c527585318287999ea2b0305fe1e723c8 100644 (file)
--- a/framework/main/classes/client/class_BaseClient.php
+++ b/framework/main/classes/client/class_BaseClient.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/client/class_BaseClient.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/client/class_BaseClient.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *