summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-1-10
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@src.gnome.org>2005-05-01 15:36:52 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-05-01 15:36:52 +0000
commit1dff283f45f52c10dfd6894c444a1c54816c280f (patch)
treec69b39fd7b07ac2af399469f6763df0fab67696a /ChangeLog.pre-1-10
parent93fdbe64dcd1dab98cdd09545a43ac9329f11534 (diff)
downloadpango-1dff283f45f52c10dfd6894c444a1c54816c280f.tar.gz
Remove a stray conflict indicator
Diffstat (limited to 'ChangeLog.pre-1-10')
-rw-r--r--ChangeLog.pre-1-101
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index fd4365e1..057ce96f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -60,7 +60,6 @@ Mon Apr 18 15:49:36 2005 Manish Singh <yosh@gimp.org>
* examples/cairoview.c: Update to new Cairo API for setting color
and opacity.
->>>>>>> 1.1097
2005-04-12 Tor Lillqvist <tml@novell.com>
* pango/opentype/Makefile.am: Rename LDADDS to