Skip to content

Commit

Permalink
マージ方法の指定をファイル名だけに変更 #178
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmaya
nmaya committed Mar 27, 2024
1 parent 4183535 commit f5969c7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
en/html/about/history.html merge=union
ja/html/about/history.html merge=union
history.html merge=union
history.html merge=union

0 comments on commit f5969c7

Please sign in to comment.