Continued:

[core.git] / framework / main / classes / filesystem / class_

diff --git a/framework/main/classes/filesystem/class_ b/framework/main/classes/filesystem/class_
index a1cc285cec5246b715ea84e4c401132c32e8f3e3..7c51898fecec7bc48aa9f19c6e63018351eda8d7 100644 (file)
--- a/framework/main/classes/filesystem/class_
+++ b/framework/main/classes/filesystem/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filesystem/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/filesystem/class_
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -31,7 +27,7 @@ class ???Filesystem extends BaseFilesystem implements Filesystem {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }