Remove stale cvs conflict marker.

2006-12-24 19:32:38 +00:00
parent 5a64bf97e1
commit 1e16587901
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -80,7 +80,6 @@
 	for replacing the selection via DND or copy-and-paste.
 	(#64998, Damon Chaplin, Sven Herzberg)

->>>>>>> 1.8517
 2006-12-23  Matthias Clasen  <mclasen@redhat.com>

 	* gtk/gtkimmulticontext.c: Be careful to not override