Some updates:

[core.git] / framework / main / interfaces / result / class_UpdateableResult.php

diff --git a/framework/main/interfaces/result/class_UpdateableResult.php b/framework/main/interfaces/result/class_UpdateableResult.php
index 66968da15658e5cdc0072dc52796d24c95d5b443..21c5970b114b48201c7d8c805ec9f0c885270b0a 100644 (file)
--- a/framework/main/interfaces/result/class_UpdateableResult.php
+++ b/framework/main/interfaces/result/class_UpdateableResult.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/result/class_UpdateableResult.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/result/class_UpdateableResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *