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