From 0351774d86fd8a6b841b1f9fbdc582d656ad20c4 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <thomas@blender.org>
Date: Fri, 18 Oct 2024 17:17:48 +0200
Subject: [PATCH] Fix error happened during merge

---
 extern/json/README.blender | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extern/json/README.blender b/extern/json/README.blender
index e953008621d..79ef3767f10 100644
--- a/extern/json/README.blender
+++ b/extern/json/README.blender
@@ -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