From 1da9631b633cf9fb02adcce1cf1417555d7efc36 Mon Sep 17 00:00:00 2001 From: Silenio Quarti Date: Fri, 3 Aug 2012 12:11:04 -0400 Subject: fix unmerged code --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 1 - 1 file changed, 1 deletion(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index d90076cca8..4655741946 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -370,7 +370,6 @@ #else #define GTK_SCROLLED_WINDOW_VSCROLLBAR(arg0) (arg0)->vscrollbar #endif -<<<<<<< HEAD #ifndef GTK_WIDGET_HAS_DEFAULT #define GTK_WIDGET_HAS_DEFAULT(arg0) 0 #endif -- cgit