X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Flanguage%2Fclass_ManageableLanguage.php;h=faf9fa2516755e5abd81bf8af08abb696c148c47;hp=8b097d3301da7469e53fde4fa864ba21a0b4178e;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/interfaces/language/class_ManageableLanguage.php b/framework/main/interfaces/language/class_ManageableLanguage.php
index 8b097d33..faf9fa25 100644
--- a/framework/main/interfaces/language/class_ManageableLanguage.php
+++ b/framework/main/interfaces/language/class_ManageableLanguage.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/language/class_ManageableLanguage.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/language/class_ManageableLanguage.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *