Commit c087b64c authored by Robert Brady's avatar Robert Brady

Kill stray conflict line.

parent fe682268
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
......@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws
......
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