Some updates:

[core.git] / framework / main / classes / fuse / class_FrameworkFuseWrapper.php_discontinued

diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
index 6f17387ca9e103a6c6ef1d52a5b72bb310e8075a..14a4c47af4326a90f987c5a073d178d814677c88 100644 (file)
--- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
+++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
@@ -17,7 +17,11 @@ use \FuseWrapper;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
  * @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/fuse/class_FrameworkFuseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *