Conflict markers

This commit is contained in:
Søren Sandmann Pedersen 2004-12-22 19:25:42 +00:00
parent 63f2fd9614
commit 512a0ebf00
4 changed files with 0 additions and 4 deletions

View File

@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford <jrb@redhat.com>
(gtk_about_dialog_init): Add missing initializations. (#161646,
Torsten Schoenfeld)
>>>>>>> 1.6233
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford <jrb@redhat.com>
(gtk_about_dialog_init): Add missing initializations. (#161646,
Torsten Schoenfeld)
>>>>>>> 1.6233
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford <jrb@redhat.com>
(gtk_about_dialog_init): Add missing initializations. (#161646,
Torsten Schoenfeld)
>>>>>>> 1.6233
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford <jrb@redhat.com>
(gtk_about_dialog_init): Add missing initializations. (#161646,
Torsten Schoenfeld)
>>>>>>> 1.6233
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version