Some updates:

[core.git] / framework / main / exceptions / main / class_ClassMismatchException.php

diff --git a/framework/main/exceptions/main/class_ClassMismatchException.php b/framework/main/exceptions/main/class_ClassMismatchException.php
index 0dda95b7d1366225f38a64b145c8151e6ab524b6..e24f0f2c73411dbdd33d54e197f954b90da2a73b 100644 (file)
--- a/framework/main/exceptions/main/class_ClassMismatchException.php
+++ b/framework/main/exceptions/main/class_ClassMismatchException.php
@@ -1,16 +1,20 @@
 <?php
 // Own namespace
-namespace CoreFramework\Object;
+namespace Org\Mxchange\CoreFramework\Object;
 
 // Import framework stuff
-use CoreFramework\Generic\FrameworkException;
+use Org\Mxchange\CoreFramework\Generic\FrameworkException;
 
 /**
  * An exception thrown when two classes are not matching
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_ClassMismatchException.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/main/class_ClassMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *