Do not auto merge package-lock.json, but treat as text file
Do not auto merge package-lock.json, but treat as text file

If package-lock is specified to be a binary file, it becomes impossible
to diff any changes. Since we only want to prevent git from merging
changes in the lockfile, we can be more specific and tell it that binary
handling is only required as merge strategy.

[skip ci]

Signed-off-by: Christoph Wurst <7abde52c298496fa169fb750f91f213a282142af@winzerhof-wurst.at>

nextcloud/server,nextcloud/server,nextcloud/server,nextcloud/server