diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2005-05-01 15:36:52 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-05-01 15:36:52 +0000 |
| commit | 1dff283f45f52c10dfd6894c444a1c54816c280f (patch) | |
| tree | c69b39fd7b07ac2af399469f6763df0fab67696a | |
| parent | 93fdbe64dcd1dab98cdd09545a43ac9329f11534 (diff) | |
| download | pango-1dff283f45f52c10dfd6894c444a1c54816c280f.tar.gz | |
Remove a stray conflict indicator
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 1 |
2 files changed, 0 insertions, 2 deletions
@@ -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 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 |