From 4888c3b76537cf8c2fe943cb306a979891d58cc7 Mon Sep 17 00:00:00 2001 From: JosiahWI Date: Mon, 15 May 2023 10:08:09 -0500 Subject: [PATCH] Remove unneeded tinygltf include from header --- source/Irrlicht/CGLTFMeshFileLoader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Irrlicht/CGLTFMeshFileLoader.h b/source/Irrlicht/CGLTFMeshFileLoader.h index 383015ccc..a082c29a2 100644 --- a/source/Irrlicht/CGLTFMeshFileLoader.h +++ b/source/Irrlicht/CGLTFMeshFileLoader.h @@ -1,3 +1,4 @@ +<<<<<<< HEAD #ifndef __C_GLTF_MESH_FILE_LOADER_INCLUDED__ #define __C_GLTF_MESH_FILE_LOADER_INCLUDED__