| .project |
| .settings/ |
| client/.classpath |
| 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/ |
| mock/target/ |
| server/.classpath |
| server/.project |
| server/.settings/ |
| server/target/ |
| server/war/ |
| shared/.classpath |
| shared/.project |
| shared/.settings/ |
| shared/target/ |
| target/ |
| widgets/.classpath |
| 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 |
| ======= |
| |
| <<<<<<< HEAD |
| >>>>>>> update git ignore |
| ======= |
| client/src/main/gwt-unitCache/ |
| client/src/main/webapp/WEB-INF/deploy/ |
| client/src/main/webapp/hupa/ |
| >>>>>>> layout the label setting view |
