Some updates:

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

diff --git a/framework/main/exceptions/file_directory/class_FileNotFoundException.php b/framework/main/exceptions/file_directory/class_FileNotFoundException.php
index 5285157dc2c109b1ff756c783bd2d4d418f91b13..b05965c659b13cd68aabb53711c6b0827db5eb04 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileNotFoundException.php
+++ b/framework/main/exceptions/file_directory/class_FileNotFoundException.php
@@ -13,7 +13,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileNotFoundException.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_FileNotFoundException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *