Skip to content

Commit

Permalink
解决冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
@zsh2401
zsh2401 committed May 26, 2020
2 parents bfd7e4d + 5da3c3a commit 2ae2239
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
azure-pipelines.yml merge=ours
azure-pipelines.yml merge=ours

0 comments on commit 2ae2239

Please sign in to comment.