Trying to fix merge conflicts.

This commit is contained in:
Jon Brisbin
2011-03-07 15:50:24 -06:00
committed by J. Brisbin
parent 1d1ee36b5a
commit 8949d53252
3 changed files with 510 additions and 503 deletions

3
.gitignore vendored
View File

@@ -1,3 +1,6 @@
.DS_Store
*.iml
*.ipr
target
.springBeans
.ant-targets-build.xml