Some updates:

[core.git] / framework / main / classes / factories / cache / class_CacheFactory.php

diff --git a/framework/main/classes/factories/cache/class_CacheFactory.php b/framework/main/classes/factories/cache/class_CacheFactory.php
index a32074496afb2918072661e33a611ed35721ba11..028bf4f411b72a9e77e7b858896f9316cb20d550 100644 (file)
--- a/framework/main/classes/factories/cache/class_CacheFactory.php
+++ b/framework/main/classes/factories/cache/class_CacheFactory.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/cache/class_CacheFactory.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/factories/cache/class_CacheFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *