From da880da079e487dcba5f2bffff94123dd8860e38 Mon Sep 17 00:00:00 2001
From: Frank Laszlo <flaszlo@nexcess.net>
Date: Fri, 2 Mar 2018 08:18:05 -0500
Subject: [PATCH] fix merge conflicts

---
 archive/entries/2018-03-01-4.xml | 19 +++++++++++++++++++
 archive/entries/2018-03-01-5.xml | 20 ++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 archive/entries/2018-03-01-4.xml
 create mode 100644 archive/entries/2018-03-01-5.xml

diff --git a/archive/entries/2018-03-01-4.xml b/archive/entries/2018-03-01-4.xml
new file mode 100644
index 000000000..ed5a2e05b
--- /dev/null
+++ b/archive/entries/2018-03-01-4.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+  <title>PHPDetroit Conference 2018</title>
+  <id>http://php.net/archive/2018.php#id2018-03-01-4</id>
+  <published>2018-03-01T18:53:16+00:00</published>
+  <updated>2018-03-01T18:53:16+00:00</updated>
+  <default:finalTeaserDate xmlns="http://php.net/ns/news">2018-07-26</default:finalTeaserDate>
+  <category term="conferences" label="Conference announcement"/>
+  <link href="http://php.net/conferences/index.php#id2018-03-01-4" rel="alternate" type="text/html"/>
+  <default:newsImage xmlns="http://php.net/ns/news" link="https://phpdetroit.io" title="PHPDetroit Conference">phpdetroit.png</default:newsImage>
+  <link href="https://phpdetroit.io" rel="via" type="text/html"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p><a href="https://phpdetroit.io">PHPDetroit</a> is a two-day, regional PHP conference that brings the community together to learn and grow. We're preceding the conference with a 2 track tutorial day that will feature 4 sessions covering various topics. We will also be running an UnCon alongside the main tracks on Friday and Saturday, where attendees can share unscheduled talks.</p>
+      <p>The conference is scheduled to run <strong>July 26th - July 28th</strong>, at the beautiful <a href="http://www.marriott.com/hotels/travel/dtwli-detroit-marriott-livonia/">Detroit Marriott Livonia.</a> We welcome developers and enthusiasts of all skill levels to come join us while we discuss the latest trends and technologies in our industry.</p>
+      <p>We look forward to seeing you in Detroit, and making the first ever <a href="https://phpdetroit.io">PHPDetroit Conference</a> a huge success.</p>
+    </div>
+  </content>
+</entry>
diff --git a/archive/entries/2018-03-01-5.xml b/archive/entries/2018-03-01-5.xml
new file mode 100644
index 000000000..f91be94a4
--- /dev/null
+++ b/archive/entries/2018-03-01-5.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+  <title>PHPDetroit Conference 2018 - Call for Papers</title>
+  <id>http://php.net/archive/2018.php#id2018-03-01-5</id>
+  <published>2018-03-01T19:09:18+00:00</published>
+  <updated>2018-03-01T19:09:18+00:00</updated>
+  <default:finalTeaserDate xmlns="http://php.net/ns/news">2018-03-22</default:finalTeaserDate>
+  <category term="cfp" label="Call for Papers"/>
+  <link href="http://php.net/conferences/index.php#id2018-03-01-5" rel="alternate" type="text/html"/>
+  <default:newsImage xmlns="http://php.net/ns/news" link="https://cfp.phpdetroit.io" title="PHPDetroit Conference">phpdetroit.png</default:newsImage>
+  <link href="https://cfp.phpdetroit.io" rel="via" type="text/html"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml">
+     <p>We're happy to announce that the <a href="https://cfp.phpdetroit.io">Call for Papers</a> has commenced for <a href="https://phpdetroit.io">PHPDetroit 2018</a>. We will be accepting submissions through March 22nd, 2018.</p>
+     <p>The conference will consist of a tutorial day featuring 4 separate 3-4 hour tutorials, 2 in the morning, and 2 in the afternoon, followed by 2 days of 1 hour sessions. We're also having an opening keynote on the first conference day, and a closing keynote on the last day. We're inviting world-class PHP speakers from around the world to submit their best talks to put together an event that will forever be remembered.</p>
+     <p>Being a first year conference, we're offering an attractive speaker package, and a special bonus for our Tutorial speakers.</p>
+     <p>If you're interested in speaking for either a session, tutorial, or keynote, please head over to <a href="https://cfp.phpdetroit.io">our CFP page</a> and submit your abstracts for consideration. We look forward to seeing you all in July!</p>
+    </div>
+  </content>
+</entry>