X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Flanguage%2Fclass_LanguageSystem.php;fp=framework%2Fmain%2Fclasses%2Flanguage%2Fclass_LanguageSystem.php;h=99df420951bee5bbac8c46b50098256e73c25d25;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=566302bdd22c350a4064363539d5e5984b8ed62f;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

diff --git a/framework/main/classes/language/class_LanguageSystem.php b/framework/main/classes/language/class_LanguageSystem.php
index 566302bd..99df4209 100644
--- a/framework/main/classes/language/class_LanguageSystem.php
+++ b/framework/main/classes/language/class_LanguageSystem.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Localization;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 // Import SPL stuff
 use \InvalidArgumentException;
@@ -17,11 +17,7 @@ use \InvalidArgumentException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/language/class_LanguageSystem.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/classes/language/class_LanguageSystem.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -89,7 +85,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 		if (empty($languageBasePath)) {
 			// No, then attempt "auto-dection":
 			// 1) Get application
-			$applicationInstance = Registry::getRegistry()->getInstance('app');
+			$applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
 			// 2) Try to build it
 			$languageBasePath = sprintf('%s%s/language/',