diff options
| author | Bruce Cowan <bruce@bcowan.me.uk> | 2010-05-25 20:27:43 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-05-25 21:46:35 +0200 |
| commit | a538f639b69a39d7bb85b39af2dfd296d28fc0aa (patch) | |
| tree | e2cb258c1fa3f8d212623de2e54b2606f6108df3 | |
| parent | 0c6565e1d3ecfae3bca096d554cb8d5378bdfcb0 (diff) | |
| download | gtk+-a538f639b69a39d7bb85b39af2dfd296d28fc0aa.tar.gz | |
Fix conflict Git markers
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=619655
| -rw-r--r-- | gtk/gtkfilechooser.c | 4 | ||||
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 6bb4c2a92b..e93f8695df 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -504,11 +504,7 @@ * </listitem> * </varlistentry> * <varlistentry> -<<<<<<< HEAD * <term><parameter>bookmark_indes</parameter> :</term> -======= - * <term><parameter>bookmark_index</parameter> :</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 11adb7aa62..026bb5912f 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 |