[gtk+] Fix conflict Git markers

[Javier Jardón <jjardon src gnome org>]

commit a538f639b69a39d7bb85b39af2dfd296d28fc0aa
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Tue May 25 20:27:43 2010 +0100

    Fix conflict Git markers
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=619655

 gtk/gtkfilechooser.c    |    4 ----
 gtk/gtkscrolledwindow.c |    6 ------
 2 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 6bb4c2a..e93f869 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -504,11 +504,7 @@
  * 	    </listitem>
  * 	  </varlistentry>
  * 	  <varlistentry>
-<<<<<<< HEAD
  * 	    <term><parameter>bookmark_indes</parameter>&nbsp;:</term>
-=======
- * 	    <term><parameter>bookmark_index</parameter>&nbsp;:</term>
->>>>>>> native-layout-incubator
  * 	    <listitem>
  * 	      <simpara>
  * 		index of the bookmark to switch to; the indices start at 0.
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 11adb7a..026bb59 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -397,15 +397,9 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
  * gtk_scrolled_window_new:
  * @hadjustment: (allow-none): horizontal adjustment
  * @vadjustment: (allow-none): vertical adjustment
-<<<<<<< HEAD
  *
  * Creates a new scrolled window.
  *
-=======
- *
- * Creates a new scrolled window.
- *
->>>>>>> native-layout-incubator
  * The two arguments are the scrolled window's adjustments; these will be
  * shared with the scrollbars and the child widget to keep the bars in sync 
  * with the child. Usually you want to pass %NULL for the adjustments, which