Skip to content

Commit

Permalink
寿司
Browse files Browse the repository at this point in the history
  • Loading branch information
firedial committed Dec 28, 2020
1 parent a0e0f12 commit 4f5c670
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion command_test/conflict.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

人のお金で役肉食べたい
人のお金で寿司食べたい


0 comments on commit 4f5c670

Please sign in to comment.