Commit 2a3d5739 authored by Matt Wilson's avatar Matt Wilson

remove conflict mark

parent d8bd40f7
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
......@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment