diff options
| author | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-03-02 20:51:40 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-03-02 20:51:40 +0000 |
| commit | 32e21f2be67d7aae6bd83351d16c0a5500c4830d (patch) | |
| tree | d27f0f4706d838eefb74642ff3d08e04d94b1b61 /ChangeLog.pre-2-8 | |
| parent | cddfd994ef4ed9a92444c409dd37d9357acbfacb (diff) | |
| download | gtk+-32e21f2be67d7aae6bd83351d16c0a5500c4830d.tar.gz | |
Remove conflict markers
Diffstat (limited to 'ChangeLog.pre-2-8')
| -rw-r--r-- | ChangeLog.pre-2-8 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d98c6409a9..96f6127e6f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -105,7 +105,6 @@ Tue Mar 2 17:55:31 2004 Matthias Clasen <maclas@gmx.de> (gtk_file_chooser_default_get_resizable_hints): Test the resize_horizontally pointer, not the deferenced pointer. ->>>>>>> 1.5102 2004-03-01 Federico Mena Quintero <federico@ximian.com> * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New |