From 9f3b8f9394e9802121b194f0f5ba3c6e5b67309c Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Mon, 17 Jan 2011 09:16:59 +0000
Subject: [PATCH] resolve conflict on POM

git-svn-id: https://svn.argeo.org/commons/trunk@4040 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.eclipse.dep.rcp/pom.xml         | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
index a6ef2d5b8..0b538d77c 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
@@ -25,12 +25,19 @@
 			<artifactId>org.argeo.eclipse.dep.common</artifactId>
 			<version>0.2.2-SNAPSHOT</version>
 		</dependency>
-		<!-- Eclipse -->
+
+		<!-- RCP Only -->
 		<dependency>
 			<groupId>org.eclipse.ui</groupId>
 			<artifactId>org.eclipse.ui</artifactId>
 		</dependency>
 
+		<!-- forms -->
+		<dependency>
+			<groupId>org.eclipse.ui</groupId>
+			<artifactId>org.eclipse.ui.forms</artifactId>
+		</dependency>
+
 		<!-- SWT -->
 		<dependency>
 			<groupId>org.eclipse.swt</groupId>
@@ -46,17 +53,17 @@
 		</dependency>
 
 
-	<!-- <dependency> -->
-	<!-- <groupId>org.eclipse.equinox</groupId> -->
-	<!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId> -->
-	<!-- </dependency> -->
-	<!-- <dependency> -->
-	<!-- <groupId>org.eclipse.equinox</groupId> -->
-	<!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId> -->
-	<!-- </dependency> -->
-	<!-- <dependency> -->
-	<!-- <groupId>org.eclipse.equinox</groupId> -->
-	<!-- <artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId> -->
-	<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.eclipse.equinox</groupId> -->
+		<!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.eclipse.equinox</groupId> -->
+		<!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.eclipse.equinox</groupId> -->
+		<!-- <artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId> -->
+		<!-- </dependency> -->
 	</dependencies>
 </project>
-- 
2.30.2