X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Foutput%2Fclass_;h=60b0b2fd90f08b10e8e337d0524571a85aea5dd6;hp=f2894d84dd155e046a7a69eeceb2947fdae4e0f7;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1abe7710d866014d74aebda110633e29bf907dee

diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_
index f2894d84..60b0b2fd 100644
--- a/framework/main/classes/output/class_
+++ b/framework/main/classes/output/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/output/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/output/class_
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *