X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Flists%2Fclass_Listable.php;h=16f1bd7afc4abeab14bde3c7104898b47d2dfb59;hp=1df8c4de0e9cd2bea031c5619e95ac34eaa8ec14;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/interfaces/lists/class_Listable.php b/framework/main/interfaces/lists/class_Listable.php
index 1df8c4de..16f1bd7a 100644
--- a/framework/main/interfaces/lists/class_Listable.php
+++ b/framework/main/interfaces/lists/class_Listable.php
@@ -14,11 +14,7 @@ use \IteratorAggregate;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/lists/class_Listable.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/interfaces/lists/class_Listable.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *