dpospisil/jboss-as — comment on commit 794fcc2371ab554d6ff1914031edd50717362aa4
File: testsuite/integration/pom.xml line 234
By bstansberry:

This merge conflict needs to be resolved.