DevHeads.net

com web/php: Resolved merge conflict by keeping both entries: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba456f571831580d7a6a" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba456f571831580d7a6a">http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba4...</a>

Log:
Resolved merge conflict by keeping both entries

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index d4b1726,8bb68e9..14977d6
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,7 +9,8 @@@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-30-1.xml"/>
+ <xi:include href="entries/2018-08-21-1.xml"/>
<xi:include href="entries/2018-08-17-1.xml"/>
<xi:include href="entries/2018-08-16-3.xml"/>
<xi:include href="entries/2018-08-16-2.xml"/>