Fix merge conflicts.

2024-01-30 11:02:09 +01:00 · 2024-01-30 11:02:09 +01:00 · 52a7772611
parent 9ae79fb1e3
commit 52a7772611
1 changed files with 4 additions and 0 deletions
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@ -540,6 +540,10 @@ struct aiBuffer {
 #endif //!  __cplusplus
 };

+#ifdef __cplusplus
+}
+#endif //!  __cplusplus
+
 // Include implementation files
 #include "vector2.inl"
 #include "vector3.inl"