Some updates:

[core.git] / framework / main / classes / controller / class_

diff --git a/framework/main/classes/controller/class_ b/framework/main/classes/controller/class_
index 907d1fbf1fec9f6559feac745b73f4c695359a1d..75be2d3de031a090f70a89e62592bd6a63110ed2 100644 (file)
--- a/framework/main/classes/controller/class_
+++ b/framework/main/classes/controller/class_
@@ -4,7 +4,11 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/class_
  * @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/controller/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -69,7 +73,5 @@ class ???Controller extends BaseController implements Controller {
                // Flush the response out
                $responseInstance->flushBuffer();
        }
-}
 
-// [EOF]
-?>
+}