X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fcontroller%2Fclass_Controller.php;h=8c5c947939b3643412ef252a26832a4d322a12a4;hp=30239686c68cb7298812d14b68ba2c156ab21e99;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/interfaces/controller/class_Controller.php b/framework/main/interfaces/controller/class_Controller.php
index 30239686..8c5c9479 100644
--- a/framework/main/interfaces/controller/class_Controller.php
+++ b/framework/main/interfaces/controller/class_Controller.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/controller/class_Controller.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/controller/class_Controller.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *