Fix a header file error, maybe

2023-01-23 13:49:17 -05:00
parent 3be267c736
commit fb48329090
2 changed files with 6 additions and 7 deletions
--- a/luprex/core/cpp/util.hpp
+++ b/luprex/core/cpp/util.hpp
@@ -26,13 +26,9 @@
 #include <utility>
 #include <algorithm>
 #include <string_view>
-<<<<<<< HEAD
-#include <limits>
-=======
-#include <cstdint>
 #include <limits>
 #include <iomanip>
->>>>>>> 4e754377ee4922940c37a20710314befeff0d84e
+// #include <cstdint>

 #include "luastack.hpp"
 #include "spookyv2.hpp"