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
/
parser
/
xml
/
class_XmlParser.php
diff --git
a/framework/main/classes/parser/xml/class_XmlParser.php
b/framework/main/classes/parser/xml/class_XmlParser.php
index f232c289f7a5815f72c05c65ee2859b562281224..9ebf852cf4107560556d3fcd244235ec7092f56e 100644
(file)
--- a/
framework/main/classes/parser/xml/class_XmlParser.php
+++ b/
framework/main/classes/parser/xml/class_XmlParser.php
@@
-12,11
+12,7
@@
use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
-<<<<<<< HEAD:framework/main/classes/parser/xml/class_XmlParser.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/parser/xml/class_XmlParser.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
*