merge did not go well
This commit is contained in:
parent
42b0fcfb8b
commit
ac40a21bb4
|
@ -125,8 +125,4 @@ int getRemainingStack(thread_t *otp);
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif /* __cplusplus */
|
|
||||||
|
|
||||||
#endif /* GLOBAL_H_ */
|
#endif /* GLOBAL_H_ */
|
||||||
|
|
Loading…
Reference in New Issue