X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fstacker%2Ffile%2Fclass_BaseFileStack.php;h=fbad6cd4107e1d937f34629cd0ed4a655df5af0f;hp=8bf35ac9aab88d04dcf03d01b8cddd5c1fb65701;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php
index 8bf35ac9..fbad6cd4 100644
--- a/framework/main/classes/stacker/file/class_BaseFileStack.php
+++ b/framework/main/classes/stacker/file/class_BaseFileStack.php
@@ -18,11 +18,7 @@ use \SplFileInfo;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/file/class_BaseFileStack.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/classes/stacker/file/class_BaseFileStack.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *