Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove conflict markers.

Browse Source 
Mon Aug 23 17:33:52 2004  Soeren Sandmann  <sandmann@redhat.com>

	* ChangeLog: Remove conflict markers.
This commit is contained in:
Soeren Sandmann
2004-08-23 15:51:44 +00:00
committed by Søren Sandmann Pedersen
parent a578e11346
commit 7d71fa2594
4 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen <maclas@gmx.de>
items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
Michael Opdenacker)
>>>>>>> 1.5542
Sun Jul 11 15:24:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Bug 143330, support update counter spec.

1
ChangeLog.pre-2-10
View File

@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen <maclas@gmx.de>
items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
Michael Opdenacker)
>>>>>>> 1.5542
Sun Jul 11 15:24:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Bug 143330, support update counter spec.

1
ChangeLog.pre-2-6
View File

@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen <maclas@gmx.de>
items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
Michael Opdenacker)
>>>>>>> 1.5542
Sun Jul 11 15:24:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Bug 143330, support update counter spec.

1
ChangeLog.pre-2-8
View File

@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004 Matthias Clasen <maclas@gmx.de>
items. (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
Michael Opdenacker)
>>>>>>> 1.5542
Sun Jul 11 15:24:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Bug 143330, support update counter spec.