mirror of
https://projects.blender.org/blender/blender.git
synced 2025-01-22 07:22:12 -05:00
Fix error happened during merge
This commit is contained in:
parent
aea5c81f73
commit
0351774d86
1 changed files with 0 additions and 1 deletions
1
extern/json/README.blender
vendored
1
extern/json/README.blender
vendored
|
@ -1,6 +1,5 @@
|
||||||
Project: JSON
|
Project: JSON
|
||||||
URL: https://github.com/nlohmann/json/
|
URL: https://github.com/nlohmann/json/
|
||||||
<<<<<<< HEAD
|
|
||||||
License: SPDX:MIT
|
License: SPDX:MIT
|
||||||
Copyright: Copyright (c) 2013-2021 Niels Lohmann
|
Copyright: Copyright (c) 2013-2021 Niels Lohmann
|
||||||
Upstream version: 3.11.3
|
Upstream version: 3.11.3
|
||||||
|
|
Loading…
Reference in a new issue