Resolve merge issue linearly

Chia-Network · Dec 19, 2020 · 9b8f392 · 9b8f392
1 parent eb96d99
commit 9b8f392
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/threading.h b/src/threading.h
@@ -1,7 +1,7 @@
 #ifndef THREADING_H
 #define THREADING_H
 
-#include <boost/align/aligned_alloc.hpp>
+#include "alloc.hpp"
 #include <atomic>
 
 //mp_limb_t is an unsigned integer