From 6c1553ce0ec1ecebf063781f79ac9942543e1455 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Wed, 17 Aug 2011 14:58:51 +0200 Subject: [PATCH] fix conflict --- include/metalsvm/tasks_types.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/metalsvm/tasks_types.h b/include/metalsvm/tasks_types.h index 926b66cd..784167a7 100644 --- a/include/metalsvm/tasks_types.h +++ b/include/metalsvm/tasks_types.h @@ -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