Remove conflict markers.
authorJuanma Barranquero <lekktu@gmail.com>
Sat, 24 Apr 2010 12:33:31 +0000 (14:33 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Sat, 24 Apr 2010 12:33:31 +0000 (14:33 +0200)
commit58ccf24384c14146d63cb6060c17f1a0e2131b6c
treea813f9247329597ef6c41825a82011f4d374ae72
parent51d28d3ec44e006746d1107f1819824d803c6232
Remove conflict markers.
src/ChangeLog