mirrors/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2025-01-22 07:22:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix error happened during merge

Browse source
This commit is contained in:
Thomas Dinges 2024-10-18 17:17:48 +02:00
parent aea5c81f73
commit 0351774d86
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extern/json/README.blender vendored
View file

@ -1,6 +1,5 @@
Project: JSON
URL: https://github.com/nlohmann/json/
<<<<<<< HEAD
License: SPDX:MIT
Copyright: Copyright (c) 2013-2021 Niels Lohmann
Upstream version: 3.11.3