Render animation fixes, vs code tasks

2026-03-15 13:22:53 -04:00
parent bbfafd7331
commit a83dbd5b6c
6 changed files with 100 additions and 14 deletions
@@ -5,6 +5,7 @@

 #include <format>

+<<<<<<< HEAD
 #include "document.hpp"
 #include "log.hpp"
 #include "map_.hpp"
@@ -12,6 +13,15 @@
 #include "strings.hpp"
 #include "toast.hpp"
 #include "vector_.hpp"
+=======
+#include "document.h"
+#include "log.h"
+#include "map_.h"
+#include "math_.h"
+#include "strings.h"
+#include "toast.h"
+#include "vector_.h"
+>>>>>>> f58d894 (Render animation fixes, vs code tasks)

 #include "../../util/map_.hpp"