Remove missed conflict
authorAlex Graveley <orph@src.gnome.org>
Wed, 16 May 2001 20:52:55 +0000 (20:52 +0000)
committerAlex Graveley <orph@src.gnome.org>
Wed, 16 May 2001 20:52:55 +0000 (20:52 +0000)
commit49c41064073b00f4521ca0dd77b9c8e9d0440fd1
treed2ede93eab6cafdd05cf4ee423ef3479cdbe6b5a
parent92f5ac2631f89f7cf567f9df194d4ee98154917b
Remove missed conflict
ChangeLog