# Conflicts: # clearing-parent/backend-api/src/main/resources/meta/meta.json # clearing-parent/backend-api/src/main/resources/meta/meta.xml # clearing-parent/backend-api/src/test/resources/meta.json |
||
|---|---|---|
| .. | ||
| src | ||
| pom.xml | ||
# Conflicts: # clearing-parent/backend-api/src/main/resources/meta/meta.json # clearing-parent/backend-api/src/main/resources/meta/meta.xml # clearing-parent/backend-api/src/test/resources/meta.json |
||
|---|---|---|
| .. | ||
| src | ||
| pom.xml | ||