Merge branch 'native-layout-incubator'

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

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 936335f424138ce316a593fac85a9b1f6a81518e..bf3cda9b1beee567cc0ecf4afdc1d234bc44f2c1 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -397,9 +397,15 @@ 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