Author: dongxu Date: Thu Sep 12 04:17:29 2013 New Revision: 1522324 URL: http://svn.apache.org/r1522324 Log: add gitignore to ignore files by git
Modified: james/hupa/trunk/.gitignore Modified: james/hupa/trunk/.gitignore URL: http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1522324&r1=1522323&r2=1522324&view=diff ============================================================================== --- james/hupa/trunk/.gitignore (original) +++ james/hupa/trunk/.gitignore Thu Sep 12 04:17:29 2013 @@ -4,7 +4,10 @@ client/.classpath client/.project client/.settings/ client/target/ +<<<<<<< HEAD client/.gwt/ +======= +>>>>>>> add gitignore to ignore files by git mock/.classpath mock/.project mock/.settings/ @@ -23,7 +26,10 @@ widgets/.classpath widgets/.project widgets/.settings/ widgets/target/ +<<<<<<< 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 --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org