diff options
| author | Manish Singh <yosh@src.gnome.org> | 2002-02-18 20:32:58 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2002-02-18 20:32:58 +0000 |
| commit | 78c6308a01da27e159ff6c6ebe12660fc5472956 (patch) | |
| tree | 7a776755281ab755bb59c0a2e49435f53508dab6 /ChangeLog.pre-2-6 | |
| parent | a3b1cd22c444987759dc2af47828b5644879c5cc (diff) | |
| download | gtk+-78c6308a01da27e159ff6c6ebe12660fc5472956.tar.gz | |
ack, remove conflict marker
Diffstat (limited to 'ChangeLog.pre-2-6')
| -rw-r--r-- | ChangeLog.pre-2-6 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0a968ba9c1..37794a8ed8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com> stuck prelighting combine some common code for button release and pressing Escape. ->>>>>>> 1.3038 Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkclist.c (adjust_adjustments) |