conflict resolve?

Fothsid · Oct 27, 2021 · e057ff6 · e057ff6
2 parents db68635 + 802f251
commit e057ff6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/tim2utils.c b/src/tim2utils.c
@@ -140,4 +140,4 @@ void* OutbreakPngToTm2(const char* input, uint16_t globalTextureId, int* x, int*
 	if (resultSize)
 		*resultSize = resultFileSize;
 	return result;
-}
+}