com web/php: resolved the merge conflict: archive/archive.xml
| From: | Eli White | Date: | Fri, 15 Dec 2017 10:35:55 +0000 |
| Subject: | com web/php: resolved the merge conflict: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26907@lists.php.net to get a copy of this message | ||
Commit: 12b12409e29d41dbcb613335658ed5b2b0f9efc6
Author: Christian Brückner <cbrueckner@sandsmedia.com> Fri, 15 Dec 2017 11:35:55
+0100
Parents: 2420639d7669e8bf014b792c09b86df6731970b3 6e127b1c0e528c1ab459b5beb2a2d665af071433
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=12b12409e29d41dbcb613335658ed5b2b0f9efc6
Log:
resolved the merge conflict
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 79968b9,fa04e51..b2f6d4b
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,9 +9,10 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2017-11-30-1.xml"/>
+ <xi:include href="entries/2017-11-24-1.xml"/>
+ <xi:include href="entries/2017-11-23-1.xml"/>
+ <xi:include href="entries/2017-11-22-1.xml"/>
<xi:include href="entries/2017-11-20-1.xml"/>
<xi:include href="entries/2017-11-09-1.xml"/>
<xi:include href="entries/2017-11-08-1.xml"/>