X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fclass_;h=a6c0d3ba79446bd3faaffeafbe154f5173834549;hp=a2afb21ab8380056bc33d617db2223ce01780eef;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/class_ b/framework/main/classes/class_
index a2afb21a..a6c0d3ba 100644
--- a/framework/main/classes/class_
+++ b/framework/main/classes/class_
@@ -4,11 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/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/class_
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *