Removed a conflict delimiter (">>>>>>> .r5422")
authorMarco Barisione <mbari@src.gnome.org>
Sat, 17 Mar 2007 14:01:24 +0000 (14:01 +0000)
committerMarco Barisione <mbari@src.gnome.org>
Sat, 17 Mar 2007 14:01:24 +0000 (14:01 +0000)
commit2920c533b8f274f0f104c78ee5988ad9b73db176
tree74319c0f460b170a549777c05eb28e94876bbc22
parent770b29bad2e95f28fda6849e9f9c30560be90cb1
Removed a conflict delimiter (">>>>>>> .r5422")

svn path=/trunk/; revision=5424
ChangeLog