projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed Registry -> GenericRegistry to make it clear that this registry does
[core.git]
/
framework
/
main
/
classes
/
database
/
result
/
class_CachedDatabaseResult.php
diff --git
a/framework/main/classes/database/result/class_CachedDatabaseResult.php
b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 4064f21a0ed2dc9a1c14f43db6a2664828aabc0f..6c36cdc04c6004f510e769dc7a7637c64386037f 100644
(file)
--- a/
framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/
framework/main/classes/database/result/class_CachedDatabaseResult.php
@@
-19,11
+19,7
@@
use \SeekableIterator;
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
-<<<<<<< HEAD:framework/main/classes/database/result/class_CachedDatabaseResult.php
* @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
* @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/database/result/class_CachedDatabaseResult.php
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*