diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2020-06-15 12:35:57 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@verizonmedia.com> | 2020-06-15 12:35:57 +0200 |
| commit | 27f7caad383b133836be7414309921cee3b23e2b (patch) | |
| tree | f500ee88517b3141d93838d7a6fef461163a6deb /pom.xml | |
| parent | a6204f050b213a2c2f4d28fbc604acf36d8a37c1 (diff) | |
Fix merge conflicts
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -83,10 +83,9 @@ <module>flags</module> <module>fsa</module> <module>hosted-api</module> + <module>hosted-tenant-base</module> <module>hosted-zone-api</module> <module>http-utils</module> - <module>hosted-api</module> - <module>hosted-tenant-base</module> <module>indexinglanguage</module> <module>jaxrs_client_utils</module> <module>jaxrs_utils</module> |