From cdc84d7fe02548bf05b5b13aacfa67e4d5ad036f Mon Sep 17 00:00:00 2001
From: Brennan Taylor <taylor.brennan@gmail.com>
Date: Wed, 13 Apr 2011 00:15:47 -0400
Subject: [PATCH] Fixing merge conflict text in xml file.

---
 events.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/events.xml b/events.xml
index e4adc79..f394849 100644
--- a/events.xml
+++ b/events.xml
@@ -17,10 +17,7 @@
 </abstract>
 
 </eventitem>
-<<<<<<< HEAD
-=======
 
->>>>>>> f176137835745620bb6a3bc79175de9c375bbc30
 <eventitem date="2011-02-17" time="07:00 PM" room="MC2017" title="A Smorgasbord of Perl Talks">
   
     <short><p><i>by KW Perl Mongers</i>. These talks are intended for programmers who are curious about the Swiss Army Chainsaw of languages, Perl.</p></short>