diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-12-13 15:28:19 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-12-13 15:28:19 +0100 |
| commit | 4fe3507527b784f7b32cbfae7b4fbc98bb04baf6 (patch) | |
| tree | c54db19ccd45e839ed32b331306a67e07128da63 /pom.xml | |
| parent | d3c1c98b5e67cf8f9bb9f3efdef3161f63c19ffc (diff) | |
Merge with master
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -23,7 +23,6 @@ </developer> </developers> -<<<<<<< HEAD <distributionManagement> <repository> <id>bintray-vespa-repo</id> @@ -959,8 +958,6 @@ <surefire.version>2.19.1</surefire.version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues --> </properties> -======= ->>>>>>> master <modules> <module>application</module> <module>application-deploy-plugin</module> |