Some updates:

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

diff --git a/framework/main/exceptions/main/class_NullPointerException.php b/framework/main/exceptions/main/class_NullPointerException.php
index 62b1e3417ebc1b27f3a36257db5a19d65d912157..9f4b0fc5a0c1f12468bc8da4bd91a6c3923c5db8 100644 (file)
--- a/framework/main/exceptions/main/class_NullPointerException.php
+++ b/framework/main/exceptions/main/class_NullPointerException.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_NullPointerException.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_NullPointerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *