Author: dongxu
Date: Thu Sep 12 04:17:41 2013
New Revision: 1522325
URL: http://svn.apache.org/r1522325
Log:
update git ignore
Modified:
james/hupa/trunk/.gitignore
Modified: james/hupa/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1522325&r1=1522324&r2=1522325&view=diff
==============================================================================
--- james/hupa/trunk/.gitignore (original)
+++ james/hupa/trunk/.gitignore Thu Sep 12 04:17:41 2013
@@ -5,9 +5,13 @@ client/.project
client/.settings/
client/target/
<<<<<<< HEAD
+<<<<<<< HEAD
client/.gwt/
=======
>>>>>>> add gitignore to ignore files by git
+=======
+client/.gwt/
+>>>>>>> update git ignore
mock/.classpath
mock/.project
mock/.settings/
@@ -27,9 +31,13 @@ widgets/.project
widgets/.settings/
widgets/target/
<<<<<<< HEAD
+<<<<<<< HEAD
client/src/main/gwt-unitCache/
client/src/main/webapp/WEB-INF/deploy/
client/src/main/webapp/hupa/
=======
>>>>>>> add gitignore to ignore files by git
+=======
+
+>>>>>>> update git ignore
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
