edit gitattr
This commit is contained in:
parent
23a93b81ef
commit
bb2bcbace4
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1 +1,2 @@
|
||||
Jenkinsfile merge=ours
|
||||
Dockerfile merge=ours
|
||||
|
Loading…
Reference in New Issue
Block a user