diff options
| author | Louis <6653109+artonge@users.noreply.github.com> | 2022-11-17 16:53:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-17 16:53:07 +0100 |
| commit | ea24e2a32326f5ee0045df4a2635dd86fb67ae08 (patch) | |
| tree | b3a96d0412acdccffd88b53b6304d6a8d1fa5777 | |
| parent | 6868cfbc2e48c552bdf5abc5cfc9099b0f15c684 (diff) | |
| parent | 5ae8f6326c6790c95690ebf82602571ed3d28ab8 (diff) | |
| download | nextcloud-server-ea24e2a32326f5ee0045df4a2635dd86fb67ae08.tar.gz nextcloud-server-ea24e2a32326f5ee0045df4a2635dd86fb67ae08.zip | |
Merge pull request #35225 from nextcloud/chore/package-lock-git-merge-strategy
Do not auto merge package-lock.json, but treat as text file
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index ca7762f3ab2..8073c8cd019 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ /dist/* binary -/package-lock.json binary
\ No newline at end of file +/package-lock.json merge=binary |