X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fdecorator%2Fxml%2Fclass_XmlCompactorDecorator.php;h=f5b4a407c18470e9e286429de6c263ee0841d270;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=3bd84ad3c56e0d465eaeb665ea0d901e2a92ee17;hpb=747a486c01615aa7888c4012cbda3fdec267abad;p=core.git diff --git a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php index 3bd84ad3..f5b4a407 100644 --- a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php +++ b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php @@ -1,18 +1,22 @@ * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/decorator/xml/class_XmlCompactorDecorator.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/decorator/xml/class_XmlCompactorDecorator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org *