projects / hildon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a9269c)
Fixed conflict marks in the ChangeLog file
authorAlberto Garcia <agarcia@igalia.com>
Wed, 17 Dec 2008 18:37:20 +0000 (18:37 +0000)
committerAlberto Garcia <agarcia@igalia.com>
Wed, 17 Dec 2008 18:37:20 +0000 (18:37 +0000)
ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index c9ed0fb..b62943a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -472,7 +472,6 @@
 
        Fixes: NB#93890 (Empty HildonAppMenu is pop-up)
 
->>>>>>> .r33194
 2008-11-27  Claudio Saavedra  <csaavedra@igalia.com>
 
        * src/hildon-picker-dialog.c:
Hildon widgets library