upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merge pull request #35225 from nextcloud/chore/package-lock-git-merge-strategy

Browse source 
Do not auto merge package-lock.json, but treat as text file
This commit is contained in:
Louis 2022-11-17 16:53:07 +01:00 committed by GitHub
commit ea24e2a323
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -1,2 +1,2 @@
/dist/* binary
/package-lock.json binary
/package-lock.json merge=binary