Merge remote-tracking branch 'origin/Temp' into Temp

# Conflicts: # image.c
2023-09-19 13:06:02 +02:00 · 2023-09-19 13:06:02 +02:00 · a3e676ba1f
commit a3e676ba1f
parent 2c768550f3 52d97f3c54
2 changed files with 1 additions and 2 deletions
--- a/image.c
+++ b/image.c
@ -1,5 +1,3 @@
 #pragma once
 #include <stdio.h>
 #include <stdlib.h>
--- a/image.h
+++ b/image.h
@ -1,4 +1,5 @@
 #pragma once
 #include "matrix.h"
 #include "matrix.h"