Commit: 2726e235af14c5e67d82ba456f571831580d7a6a Author: Adam Culp <adamc...@uws.net> Tue, 11 Sep 2018 15:32:28 -0400 Parents: ff13e6b85513781d52ece4f335211b9a582e836b bb8b13f97d022a14f658e6d62cd312f5beeaddc9 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba456f571831580d7a6a 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-webmaster@lists.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"/> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
