X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fstacker%2Ffile%2Ffifo%2Fclass_FiFoFileStack.php;h=9994e38cb3ed071f05f68af972d75c9c3051c73d;hp=d44ba9f6dd2c7c32fc1daa616628ef87c0080d16;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
index d44ba9f6..9994e38c 100644
--- a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
+++ b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
@@ -16,11 +16,7 @@ use \SplFileInfo;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
  * @copyright	Copyright (c) 2017 Core Developer Team
-=======
- * @copyright	Copyright (c) 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *