merge did not go well

2017-04-02 22:59:13 -04:00 · 2017-04-02 22:59:13 -04:00 · ac40a21bb4
parent 42b0fcfb8b
commit ac40a21bb4
1 changed files with 0 additions and 4 deletions
--- a/firmware/global.h
+++ b/firmware/global.h
@ -125,8 +125,4 @@ int getRemainingStack(thread_t *otp);
 }
 #endif /* __cplusplus */

-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* GLOBAL_H_ */