ClaptrapBot/.gitattributes

3 lines
46 B
Plaintext
Raw Normal View History

2018-02-18 12:21:12 +01:00
Jenkinsfile merge=ours
2018-03-01 12:52:31 +01:00
Dockerfile merge=ours