X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fvisitor%2Fdecorator%2Fclass_DecoratorVisitor.php;h=3d9617e9091729f5e058fe4c381869039983cc91;hp=9c79170eb4a7955a5a9c5eb29376ccd1b87d74f3;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
index 9c79170e..3d9617e9 100644
--- a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
+++ b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.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/visitor/decorator/class_DecoratorVisitor.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *