com web/php: Merged in IPC Call for Papers and dealt with minor merge conflict: archive/archive.xml
| From: | Eli White | Date: | Fri, 11 Nov 2016 14:54:53 +0000 |
| Subject: | com web/php: Merged in IPC Call for Papers and dealt with minor merge conflict: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25314@lists.php.net to get a copy of this message | ||
Commit: 31c49cafc2c2d090f9e6765b6eae890c0ea6661f
Author: Eli White <eli@eliw.com> Fri, 11 Nov 2016 09:54:53 -0500
Parents: 6f7545a35fbe06786196cd6100d555424a160cb3 bc9a1a82e9d265cfe4685ac557089b6ad45ec44a
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=31c49cafc2c2d090f9e6765b6eae890c0ea6661f
Log:
Merged in IPC Call for Papers and dealt with minor merge conflict
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index d2c453d,ad78bc2..78e0541
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,10 -9,7 +9,11 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2016-11-10-3.xml"/>
+ <xi:include href="entries/2016-11-10-2.xml"/>
+ <xi:include href="entries/2016-11-10-1.xml"/>
+ <xi:include href="entries/2016-11-02-1.xml"/>
+ <xi:include href="entries/2016-11-01-1.xml"/>
<xi:include href="entries/2016-10-28-1.xml"/>
<xi:include href="entries/2016-10-27-1.xml"/>
<xi:include href="entries/2016-10-26-1.xml"/>