[eclipse/f18] Remove merge artifacts.

[Krzysztof Daniel]

commit 2b71e0b459de8007b30fb4aacf07c777f46ea9c6
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Feb 19 17:54:49 2013 +0100

    Remove merge artifacts.

 eclipse.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 1ff6587..1772537 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -65,7 +65,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.8.git20121217%{?dist}
+Release:        0.9.git20121217%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -1064,7 +1064,6 @@ rm -rf %{_bindir}/efj/
 
 
 %files swt
-<<<<<<< f18
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/notice.html
@@ -1322,6 +1321,9 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Tue Feb 19 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.2-0.9.git20121217
+- Remove merge artifacts.
+
 * Tue Feb 19 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.2-0.8.git20121217
 - RHBZ#912664 - eclipse-swt should put swt.jar into /usr/lib/java even on 64 bit systems.
 - RHBZ#903537 - [abrt] java-1.7.0-openjdk-1.7.0.9-2.3.4.fc18: gtk_widget_real_map (SIGABRT)