Skip to content

Commit

Permalink
chore: add gitattributes to prevent merge issues with version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
insuusvenerati committed May 7, 2022
1 parent ca9f57a commit 70d4bfd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package.json merge=ours

1 comment on commit 70d4bfd

@vercel
Copy link

@vercel vercel bot commented on 70d4bfd May 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.