com web/php: Fixing merge: archive/archive.xml
| From: | Eli White | Date: | Wed, 08 Nov 2017 15:44:25 +0000 |
| Subject: | com web/php: Fixing merge: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26543@lists.php.net to get a copy of this message | ||
Commit: 4a8fc0430911e877837b36421d07ab24e9b653f9
Author: Eli White <eli@eliw.com> Wed, 8 Nov 2017 10:44:25 -0500
Parents: 105f982666118b78e017e9dd22169f4910b8d832 0aa270a29d6a2ce3b91915ec25ae321869f3bcc0
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=4a8fc0430911e877837b36421d07ab24e9b653f9
Log:
Fixing merge
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 996dee5,e77322d..12cfeaa
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,7 +9,8 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2017-11-08-1.xml"/>
+ <xi:include href="entries/2017-11-06-1.xml"/>
<xi:include href="entries/2017-10-27-1.xml"/>
<xi:include href="entries/2017-10-26-3.xml"/>
<xi:include href="entries/2017-10-26-2.xml"/>