From e4b0a76f56e290b7b052b4d5dad7ebb710f12c98 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Thu, 26 May 2022 17:56:56 +0200
Subject: fix merge conflicts

---
 robot/orangutan_shim.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'robot/orangutan_shim.h')

diff --git a/robot/orangutan_shim.h b/robot/orangutan_shim.h
index cd624d0..10420bd 100644
--- a/robot/orangutan_shim.h
+++ b/robot/orangutan_shim.h
@@ -5,6 +5,7 @@
 #else
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
+#include <pololu/3pi.h>
 #include <pololu/orangutan.h>
 #pragma GCC diagnostic pop
 #endif
-- 
cgit v1.2.3