fix: merge conflict

2026-07-05 21:20:59 +02:00
parent 421caaac01
commit cf79bcbfbc
5 changed files with 103 additions and 239 deletions
@@ -243,12 +243,7 @@ float Cross2D(Vector2 a, Vector2 b);
 Vector2 GetPositionInsideRectangle(Rectangle rec);
 Vector2 GetPositionOutsideRectangle(Rectangle rec, int min, int max);

-<<<<<<< HEAD
-bool SaveStorageValue(const char* fileName, unsigned int position, int value);
-int LoadStorageValue(const char* fileName, unsigned int position);
+bool SaveStorageValue(const char *fileName, unsigned int position, int value);
+int LoadStorageValue(const char *fileName, unsigned int position);

-#endif //ENGINE_H
-
-=======
 #endif // ENGINE_H
->>>>>>> origin/pirate