diff options
| author | Soeren Sandmann <sandmann@redhat.com> | 2004-08-23 15:51:44 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-08-23 15:51:44 +0000 |
| commit | 7d71fa25941d431a503979c4230418522a6be1b5 (patch) | |
| tree | d1c1b17bbb31e8de43914be1825380677ba37270 /ChangeLog.pre-2-8 | |
| parent | a578e1134643b4076c34675cad79499b48eb7387 (diff) | |
| download | gtk+-7d71fa25941d431a503979c4230418522a6be1b5.tar.gz | |
Remove conflict markers.
Mon Aug 23 17:33:52 2004 Soeren Sandmann <sandmann@redhat.com>
* ChangeLog: 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 141a751952..2d4373e380 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen <maclas@gmx.de> items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte, Michael Opdenacker) ->>>>>>> 1.5542 Sun Jul 11 15:24:03 2004 Soeren Sandmann <sandmann@daimi.au.dk> Bug 143330, support update counter spec. |