Commit 00ab5822 authored by descamps's avatar descamps
Browse files

KDE - 18/05/2021 - Ajout du gitattributes pour garder les configurations entre branches

parent b2d2ff9f
Pipeline #3450 passed with stage
in 12 seconds
api/api-ingest/ingest-internal/pom.xml merge=ours
.gitlab-ci.yml merge=ours
pom.xml merge=ours
ui/ui-frontend/proxy.conf.json merge=ours
dev-deployment/* merge=ours
api/api-security/security-internal/src/main/config/*.yml merge=ours
api/api-iam/iam-external/src/main/config/*.yml merge=ours
api/api-iam/iam-internal/src/main/config/*.yml merge=ours
api/api-iam/iam-internal/src/main/config/dev-vitamui/* merge=ours
cas/cas-server/src/main/config/*.yml merge=ours
ui/ui-portal/src/main/config/*.yml merge=ours
ui/ui-identity/src/main/config/*.yml merge=ours
ui/ui-pastis/src/main/config/*.yml merge=ours
ui/ui-frontend/proxy.conf.json merge=ours
Dockerfile merge=ours
run-images.sh merge=ours
tag-images.sh merge=ours
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment