diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
| commit | 193f7f5e096751da747b0fe9d145bd43a02d7340 (patch) | |
| tree | ce0aa138252ca76426fbbc84e1753d7e410011a9 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | |
| parent | 98493042a5dace2535dd4343c047eaf1bd784ae3 (diff) | |
| parent | f468145c16b5c677201327feeb4f207c21df0b0b (diff) | |
| download | Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.tar.gz Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.zip | |
merge after conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index f4242be2b..92fd9549e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -6,7 +6,7 @@ */ #include"include.h" #include "thread.h" -#include "Drivers/Peripheral_GPIO/GPIO.h" + #include "drivers/Motors/Motor.h" #include "StateMachines/Printing/PrintingSTM.h" #include "Modules/Control/Control.h" |