From 1dff283f45f52c10dfd6894c444a1c54816c280f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 1 May 2005 15:36:52 +0000 Subject: Remove a stray conflict indicator --- ChangeLog | 1 - ChangeLog.pre-1-10 | 1 - 2 files changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd4365e1..057ce96f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,7 +60,6 @@ Mon Apr 18 15:49:36 2005 Manish Singh * examples/cairoview.c: Update to new Cairo API for setting color and opacity. ->>>>>>> 1.1097 2005-04-12 Tor Lillqvist * 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 * examples/cairoview.c: Update to new Cairo API for setting color and opacity. ->>>>>>> 1.1097 2005-04-12 Tor Lillqvist * pango/opentype/Makefile.am: Rename LDADDS to -- cgit v1.2.1