X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fmailer%2Fdebug%2Fclass_DebugMailer.php;h=c9292dda89d3ffa8e8d9a5b66aeb55f85d82162e;hp=200a0ececf04383026a123dafe93c5078c7c532f;hb=8d8cf621bd811811cecd83c65a4ab91f27258e79;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php
index 200a0ece..c9292dda 100644
--- a/framework/main/classes/mailer/debug/class_DebugMailer.php
+++ b/framework/main/classes/mailer/debug/class_DebugMailer.php
@@ -9,7 +9,7 @@ use Org\Mxchange\CoreFramework\Mailer\BaseMailer;
 use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
 use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
@@ -18,11 +18,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/mailer/debug/class_DebugMailer.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/mailer/debug/class_DebugMailer.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -181,7 +177,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 		$templateInstance->assignTemplateWithVariable('footer', 'footer');
 
 		// Load the master template
-		$templateInstance->loadCodeTemplate(Registry::getRegistry()->getInstance('app')->buildMasterTemplateName());
+		$templateInstance->loadCodeTemplate(GenericRegistry::getRegistry()->getInstance('application')->buildMasterTemplateName());
 
 		// Then compile it again
 		$templateInstance->compileVariables();