Re: [PATCH 3/3] merge error fixes

2021-04-24 Thread Vijay Kumar Banerjee
Hi Robin, On Sat, Apr 24, 2021 at 5:56 AM Robin Mueller wrote: > > A function was defined twice due to a merge error. > This patch fixes this. Please squash these into one, since they're not upstream yet, it's not a problem to squash them into the patch that cased the merge error. This way it wi

[PATCH 3/3] merge error fixes

2021-04-24 Thread Robin Mueller
A function was defined twice due to a merge error. This patch fixes this. --- lwip/ports/drivers/rtems_lwip.c | 30 -- 1 file changed, 30 deletions(-) diff --git a/lwip/ports/drivers/rtems_lwip.c b/lwip/ports/drivers/rtems_lwip.c index a106616..7e2771c 100644 --- a/lw