X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fclass_BaseController.php;h=729f51e1dd1108fb6dd7ac9ed00a4ba52c6a5c31;hp=fa746cd756c28deb551f273e77459e72a8cd3a05;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74

diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php
index fa746cd7..729f51e1 100644
--- a/framework/main/classes/controller/class_BaseController.php
+++ b/framework/main/classes/controller/class_BaseController.php
@@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/class_BaseController.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/classes/controller/class_BaseController.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -36,7 +40,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseController extends BaseFrameworkSystem implements Registerable {
+abstract class BaseController extends BaseFrameworkSystem implements Registerable {
 	// Exception constants
 	const EXCEPTION_FILTER_CHAIN_INVALID = 0xf10;