Some updates:

[core.git] / framework / main / interfaces / user / class_ManageableAccount.php

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