feedc0de/fmt
1
0 Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

ours -> keep-ours

Browse Source
This commit is contained in:
vitaut committed 2015-10-18 10:24:54 -07:00
1 parent f6135df529
commit a43e242716
1 file changed
+1 -1
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