merge did not go well

This commit is contained in:
rusefi 2017-04-02 22:59:13 -04:00
parent 42b0fcfb8b
commit ac40a21bb4
1 changed files with 0 additions and 4 deletions

View File

@ -125,8 +125,4 @@ int getRemainingStack(thread_t *otp);
}
#endif /* __cplusplus */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* GLOBAL_H_ */