| commit | 7fe86d428ec0154cad18c62ceaf8d825cd6dd771 | [log] [tgz] |
|---|---|---|
| author | johnbracken <john.b.bracken@oracle.com> | Mon Nov 12 22:59:59 2012 -0800 |
| committer | johnbracken <john.b.bracken@oracle.com> | Mon Nov 12 22:59:59 2012 -0800 |
| tree | a803eb7e124d313d86b0b8d5d9349cc25dea9011 | |
| parent | 9a4b98506688d88e624d6bf3982013d6c63f75fa [diff] |
Fix for improper GIT merge in the pom.xml.