ClaptrapBot/.gitattributes
2018-03-01 12:50:52 +01:00

3 lines
46 B
Plaintext

Jenkinsfile merge=ours
Dockerfile merge=ours