diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2022-08-09 22:34:12 +0200 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2022-08-09 22:34:12 +0200 |
| commit | 76ed6228dc0b88840d01f99761ca09323bf11c51 (patch) | |
| tree | 7d996dac5c1bbdde8a86929e17e1cac67d76220d /fw/fe310/test/main.c | |
| parent | 3b560c931c0d452b048c7a715e245e23f15d9924 (diff) | |
| parent | d61f8dd66ff2337319aa61e4ce2fd72a90c20b76 (diff) | |
fixed conflict
Diffstat (limited to 'fw/fe310/test/main.c')
| -rw-r--r-- | fw/fe310/test/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fw/fe310/test/main.c b/fw/fe310/test/main.c index 36ad5b8..2fc1a04 100644 --- a/fw/fe310/test/main.c +++ b/fw/fe310/test/main.c @@ -28,8 +28,6 @@ #include "wifi.h" #include "cam.h" #include "fs.h" -#include "audio.h" -#include "ecp.h" #include "test.h" const uint32_t _eos_touch_matrix[6] = {0xf7ac,0x440,0x3e704,0xfffff718,0x108a3,0xfff76d42}; |