Author: dongxu
Date: Thu Sep 12 03:26:44 2013
New Revision: 1522204
URL: http://svn.apache.org/r1522204
Log:
fixing weird error in compilation: Deferred binding failed for
'com.google.gwt.user.client.ui.NativeHorizontalScrollbar'
Modified:
james/hupa/trunk/client/pom.xml
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522204&r1=1522203&r2=1522204&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 03:26:44 2013
@@ -54,7 +54,25 @@
<description>A GWT based IMAP webmail</description>
<dependencies>
<dependency>
+<<<<<<< HEAD
<groupId>org.apache.hupa</groupId>
+=======
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+>>>>>>> fixing weird error in compilation: Deferred binding failed for
'com.google.gwt.user.client.ui.NativeHorizontalScrollbar'
<artifactId>hupa-server</artifactId>
</dependency>
<dependency>
@@ -95,6 +113,7 @@
<artifactId>gwtupload</artifactId>
</dependency>
<dependency>
+<<<<<<< HEAD
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<exclusions>
@@ -122,6 +141,8 @@
<artifactId>gwt-dev</artifactId>
</dependency>
<dependency>
+=======
+>>>>>>> fixing weird error in compilation: Deferred binding failed for
'com.google.gwt.user.client.ui.NativeHorizontalScrollbar'
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
