com web/php: Fixed conflict caused by waiting too long to merge this: archive/archive.xml archive/entries/2017-11-22-2.xml

Commit: 178c86c4c698b75d2dcd325f81ad3fe2d7307975 Author: Eli White <eli@eliw.com> Tue, 6 Feb 2018 16:07:19 -0500 Parents: 7ea87efb4d2d47aedaf50b40250a9bc05e0fd207 66a6f7e33bd0a7f2734d648da845bc4384777a8d Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=178c86c4c698b75d2dcd325f81ad3fe2d7307975 Log: Fixed conflict caused by waiting too long to merge this Changed paths: MM archive/archive.xml AA archive/entries/2017-11-22-2.xml Diff: diff --cc archive/archive.xml index a62356c,79968b9..8018ffb --- a/archive/archive.xml +++ b/archive/archive.xml @@@ -9,19 -9,8 +9,20 @@@ <uri>http://php.net/contact</uri> <email>php-webmaster@lists.php.net</email> </author> + <xi:include href="entries/2018-02-01-2.xml"/> + <xi:include href="entries/2018-02-01-1.xml"/> + <xi:include href="entries/2018-01-31-1.xml"/> + <xi:include href="entries/2018-01-04-4.xml"/> + <xi:include href="entries/2018-01-04-3.xml"/> + <xi:include href="entries/2018-01-04-2.xml"/> + <xi:include href="entries/2018-01-04-1.xml"/> + <xi:include href="entries/2017-11-30-1.xml"/> + <xi:include href="entries/2017-11-24-1.xml"/> + <xi:include href="entries/2017-11-23-1.xml"/> ++ <xi:include href="entries/2017-11-22-2.xml"/> <xi:include href="entries/2017-11-22-1.xml"/> <xi:include href="entries/2017-11-20-1.xml"/> + <xi:include href="entries/2017-11-16-1.xml"/> <xi:include href="entries/2017-11-09-1.xml"/> <xi:include href="entries/2017-11-08-1.xml"/> <xi:include href="entries/2017-11-06-1.xml"/> diff --cc archive/entries/2017-11-22-2.xml index 0000000,0000000..87429e5 new file mode 100644 --- /dev/null +++ b/archive/entries/2017-11-22-2.xml @@@ -1,0 -1,0 +1,23 @@@ ++<?xml version="1.0" encoding="utf-8"?> ++<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news"> ++ <title>PHPKonf Istanbul PHP Conference 2018 - Call for Papers</title> ++ <id>http://php.net/archive/2017.php#id2017-11-22-2</id> ++ <published>2017-11-22T09:00:00+00:00</published> ++ <updated>2017-11-22T09:00:00+00:00</updated> ++ <default:finalTeaserDate xmlns="http://php.net/ns/news">2018-01-31</default:finalTeaserDate> ++ <category term="cfp" label="Call for Papers"/> ++ <link href="http://php.net/conferences/index.php#id2017-11-22-2" rel="alternate" type="text/html"/> ++ <default:newsImage xmlns="http://php.net/ns/news" link="https://cfp.phpkonf.org/" title="PHPKonf Istanbul PHP Conference 2018">phpkonf_2015.png</default:newsImage> ++ <link href="https://cfp.phpkonf.org/" rel="via" type="text/html"/> ++ <content type="xhtml"> ++ <div xmlns="http://www.w3.org/1999/xhtml"> ++ <p>PHPKonf 2018 is an annual PHP oriented conference in Istanbul, Turkey and will take place on Sunday, 20th of May, 2018.</p> ++ ++ <p>The <a href="https://cfp.phpkonf.org/">call for papers</a> for the PHPKonf 2018 Istanbul PHP conference is open! If you have a burning desire to hold forth about PHP, DevOps, databases, JavaScript, or any other web development topics, we want to see your proposals. Call for Papers is open only from November 20, 2017 to January 31, 2018, so hurry. An added benefit: we will cover your travel and hotel.</p> ++ ++ <p>You’ll have 45 minutes for the talk, with 35 minutes for your topic and 10 minutes for Q&amp;A. We can’t wait to see your proposals! Check out the <a href="http://2017.phpkonf.org/">last conference</a> to get an idea of what to expect.</p> ++ ++ <p>Follow us on <a href="https://twitter.com/istanbulphp">Twitter</a> to stay updated with news from the PHPKonf crew.</p> ++ </div> ++ </content> ++</entry>