Some updates:

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

diff --git a/framework/main/exceptions/main/class_InvalidObjectException.php b/framework/main/exceptions/main/class_InvalidObjectException.php
index 0f28af78f14583ea50cc739b30ed6e66a6f2f680..cec325b1f018a8d90b124bc07cecd5d4d32bdf72 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidObjectException.php
+++ b/framework/main/exceptions/main/class_InvalidObjectException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidObjectException.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_InvalidObjectException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore