Some updates:

[core.git] / framework / main / exceptions / file_directory / class_FileIoException.php

diff --git a/framework/main/exceptions/file_directory/class_FileIoException.php b/framework/main/exceptions/file_directory/class_FileIoException.php
index 573c9099d45c2986728a58ddc4c1c0fbfe8c773c..535e5230fcadde5f620476dc353f4b7d05301f80 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileIoException.php
+++ b/framework/main/exceptions/file_directory/class_FileIoException.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filesystem;
+namespace Org\Mxchange\CoreFramework\Filesystem;
 
 // Import framework stuff
-use CoreFramework\Generic\FrameworkException;
+use Org\Mxchange\CoreFramework\Generic\FrameworkException;
 
 // Import SPL stuff
 use \SplFileInfo;
@@ -14,7 +14,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileIoException.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/exceptions/file_directory/class_FileIoException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *