Merge branch 'native-layout-incubator'

[~andy/gtk] / gtk / gtkfilechooser.c

diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 70ddfda1aaa075e1a7a4300bad3f96aa57c11a97..7341b6397413a7eec98596afc7ac33dce26ef1f7 100644 (file)
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -504,7 +504,11 @@
  *         </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.