DevHeads.net

com web/php: Resolved merge conflict by keeping old and new entries: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c330a2959e44b13366b9" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c330a2959e44b13366b9">http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c33...</a>

Log:
Resolved merge conflict by keeping old and new entries

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index 14977d6,c031653..e2c572a
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -10,7 -10,7 +10,8 @@@
<email>php- ... at lists dot php.net</email>
</author>
<xi:include href="entries/2018-08-30-1.xml"/>
+ <xi:include href="entries/2018-08-28-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"/>