stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix conflict

Browse source
This commit is contained in:
Stefan Lankes 2011-08-17 14:58:51 +02:00
parent f3a817ee92
commit 6c1553ce0e
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/metalsvm/tasks_types.h
View file

@ -93,11 +93,7 @@ typedef struct task {
/// Start address of the heap
size_t start_heap;
/// End address of the heap
<<<<<<< HEAD
size_t end_heap;
=======
uint32_t end_heap;
>>>>>>> master
/// LwIP error code
int lwip_err;
/// Mail inbox