X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fhandler%2Fclass_BaseHandler.php;h=c5dcd4857f373cd5cd82c8eced287f1a17764ce7;hp=48a6b084fa9a16f2cc956d3687c6e5e616a0f166;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php
index 48a6b084..c5dcd485 100644
--- a/framework/main/classes/handler/class_BaseHandler.php
+++ b/framework/main/classes/handler/class_BaseHandler.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/handler/class_BaseHandler.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/handler/class_BaseHandler.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *