Fixing merge conflict text in xml file.
authorBrennan Taylor <taylor.brennan@gmail.com>
Wed, 13 Apr 2011 04:15:47 +0000 (00:15 -0400)
committerBrennan Taylor <taylor.brennan@gmail.com>
Wed, 13 Apr 2011 04:15:47 +0000 (00:15 -0400)
events.xml

index e4adc79..f394849 100644 (file)
 </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>