diff --git a/ChangeLog b/ChangeLog index 687086aeb..ba7517117 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,7 +121,6 @@ Tue Aug 19 09:42:06 2003 Owen Taylor * glib/glib.def: Remove two dups. ->>>>>>> 1.1255.2.96 2003-08-08 Matthias Clasen * configure.in: Forgot to actually switch to trio if snprintf() isn't good enough. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 687086aeb..ba7517117 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -121,7 +121,6 @@ Tue Aug 19 09:42:06 2003 Owen Taylor * glib/glib.def: Remove two dups. ->>>>>>> 1.1255.2.96 2003-08-08 Matthias Clasen * configure.in: Forgot to actually switch to trio if snprintf() isn't good enough. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 687086aeb..ba7517117 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -121,7 +121,6 @@ Tue Aug 19 09:42:06 2003 Owen Taylor * glib/glib.def: Remove two dups. ->>>>>>> 1.1255.2.96 2003-08-08 Matthias Clasen * configure.in: Forgot to actually switch to trio if snprintf() isn't good enough. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 687086aeb..ba7517117 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -121,7 +121,6 @@ Tue Aug 19 09:42:06 2003 Owen Taylor * glib/glib.def: Remove two dups. ->>>>>>> 1.1255.2.96 2003-08-08 Matthias Clasen * configure.in: Forgot to actually switch to trio if snprintf() isn't good enough. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 687086aeb..ba7517117 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -121,7 +121,6 @@ Tue Aug 19 09:42:06 2003 Owen Taylor * glib/glib.def: Remove two dups. ->>>>>>> 1.1255.2.96 2003-08-08 Matthias Clasen * configure.in: Forgot to actually switch to trio if snprintf() isn't good enough. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 687086aeb..ba7517117 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -121,7 +121,6 @@ Tue Aug 19 09:42:06 2003 Owen Taylor * glib/glib.def: Remove two dups. ->>>>>>> 1.1255.2.96 2003-08-08 Matthias Clasen * configure.in: Forgot to actually switch to trio if snprintf() isn't good enough.