www
/
www
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixing merge conflict text in xml file.

This commit is contained in:
Brennan Taylor 2011-04-13 00:15:47 -04:00
parent 36a7aba3cf
commit cdc84d7fe0
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
events.xml
View File

@ -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>