X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Ffile_directory%2Fclass_FileIoException.php;h=535e5230fcadde5f620476dc353f4b7d05301f80;hp=e1649d038dc894d3340e456789b32a9a452dcc41;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/exceptions/file_directory/class_FileIoException.php b/framework/main/exceptions/file_directory/class_FileIoException.php
index e1649d03..535e5230 100644
--- a/framework/main/exceptions/file_directory/class_FileIoException.php
+++ b/framework/main/exceptions/file_directory/class_FileIoException.php
@@ -14,7 +14,11 @@ use \SplFileInfo;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileIoException.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_FileIoException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *