edit gitattr

This commit is contained in:
Sebastien 2018-03-01 12:50:52 +01:00
parent cd375a4711
commit 4f4e8d114f

1
.gitattributes vendored
View File

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