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)
commitcdc84d7fe02548bf05b5b13aacfa67e4d5ad036f
tree0d79762f49337f43af3c09855927df0a4bfdc372
parent36a7aba3cf9c85687f345c4bf11102807ac51551
Fixing merge conflict text in xml file.
events.xml