com web/php: Resolved merge conflict by keeping old and new entries: archive/archive.xml
| From: | Adam Culp | Date: | Tue, 11 Sep 2018 19:40:36 +0000 |
| Subject: | com web/php: Resolved merge conflict by keeping old and new entries: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-27260@lists.php.net to get a copy of this message | ||
Commit: 6233c22407627405b493c330a2959e44b13366b9
Author: Adam Culp <adamculp@uws.net> Tue, 11 Sep 2018 15:40:36 -0400
Parents: 2726e235af14c5e67d82ba456f571831580d7a6a 565c4e2842fe849c5d2ca22e42d7eba109fc60b7
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c330a2959e44b13366b9
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-webmaster@lists.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"/>