X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Ffile_directory%2Fclass_FileNotFoundException.php;h=5285157dc2c109b1ff756c783bd2d4d418f91b13;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=b05965c659b13cd68aabb53711c6b0827db5eb04;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

diff --git a/framework/main/exceptions/file_directory/class_FileNotFoundException.php b/framework/main/exceptions/file_directory/class_FileNotFoundException.php
index b05965c6..5285157d 100644
--- a/framework/main/exceptions/file_directory/class_FileNotFoundException.php
+++ b/framework/main/exceptions/file_directory/class_FileNotFoundException.php
@@ -13,11 +13,7 @@ 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
  *