leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ours -> keep-ours

Browse Source
This commit is contained in:
vitaut
2015-10-18 10:24:54 -07:00
parent f6135df529
commit a43e242716
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1 -1
View File
@@ -1 +1 @@
.travis.yml merge=ours
.travis.yml merge=keep-ours