sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

edit gitattr

Browse Source
This commit is contained in:
Sebastien 2018-03-01 12:52:31 +01:00
parent 23a93b81ef
commit bb2bcbace4
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

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