X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Foutput%2Fclass_;h=1f1588ddfa5c58957f2e1def0fece2b572fe2e70;hb=9128348f96854b318a9bf8884b1ee035f3f94e6c;hp=60b0b2fd90f08b10e8e337d0524571a85aea5dd6;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_
index 60b0b2fd..1f1588dd 100644
--- a/framework/main/classes/output/class_
+++ b/framework/main/classes/output/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/output/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/output/class_
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -61,7 +57,7 @@ class ???Output extends BaseOutput implements OutputStreamer, Registerable {
 			self::$!!!Instance = new WebOutput();
 
 			// Get the content type
-			$contentType = self::$!!!Instance->getConfigInstance()->getConfigEntry('!!!_content_type');
+			$contentType = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('!!!_content_type');
 
 			// Set the content type
 			if (!empty($contentType)) {