griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 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
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 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