Skip to content

Commit 44be6fb

Browse files
committed
Update .gitattributes to keep local README.md version during merges
1 parent 103e697 commit 44be6fb

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Keep local versions of these files when merging from main
22
backend/src/main/resources/application.yml merge=ours
33
frontend/lib/api.ts merge=ours
4+
README.md merge=ours

0 commit comments

Comments
 (0)