You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:22:10 UTC

svn commit: r1522190 - /james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml

Author: dongxu
Date: Thu Sep 12 03:22:10 2013
New Revision: 1522190

URL: http://svn.apache.org/r1522190
Log:
remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files

Modified:
    james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml?rev=1522190&r1=1522189&r2=1522190&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml Thu Sep 12 03:22:10 2013
@@ -18,12 +18,15 @@
 <module>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
   <inherits name='net.customware.gwt.dispatch.Dispatch' />
 >>>>>>> first commit
 =======
   <inherits name='net.customware.gwt.dispatch.Dispatch' />
 >>>>>>> first commit
+=======
+>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
   <inherits name='com.google.gwt.user.User'/>
   <source path="shared"/>
 </module>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org