edit gitattr

This commit is contained in:
Sebastien 2018-03-01 12:52:31 +01:00
parent 23a93b81ef
commit bb2bcbace4

1
.gitattributes vendored
View File

@ -1 +1,2 @@
Jenkinsfile merge=ours
Dockerfile merge=ours