diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-03 12:11:04 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-03 12:11:04 -0400 |
| commit | 1da9631b633cf9fb02adcce1cf1417555d7efc36 (patch) | |
| tree | 85774aea4b1e89e78ad634685343bfa928aa9b24 | |
| parent | d47355702acdef06640d631533517b1f7a3bfe38 (diff) | |
| download | eclipse.platform.swt-1da9631b633cf9fb02adcce1cf1417555d7efc36.tar.gz eclipse.platform.swt-1da9631b633cf9fb02adcce1cf1417555d7efc36.tar.xz eclipse.platform.swt-1da9631b633cf9fb02adcce1cf1417555d7efc36.zip | |
fix unmerged code
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 1 |
1 files changed, 0 insertions, 1 deletions
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 |