X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fthird_party%2Fapi%2Fwernisportal%2Fclass_WernisApi.php;h=f217f103c6665dc03860bf76380dd3550619cfdc;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=cb85170a326d0538c4204d1378f25c2f9c6618bc;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74;p=core.git

diff --git a/framework/main/third_party/api/wernisportal/class_WernisApi.php b/framework/main/third_party/api/wernisportal/class_WernisApi.php
index cb85170a..f217f103 100644
--- a/framework/main/third_party/api/wernisportal/class_WernisApi.php
+++ b/framework/main/third_party/api/wernisportal/class_WernisApi.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/third_party/api/wernisportal/class_WernisApi.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/third_party/api/wernisportal/class_WernisApi.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Out-dated since 0.6-BETA