Skip to content

GitLab

Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit ff7a18bd authored by Colin González's avatar Colin González
Browse files

Removed old test files

parent f2e23346
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
Makefile
View file @ ff7a18bd
...@@ -159,7 +159,12 @@ C_OBJECTS += event_groups.o ...@@ -159,7 +159,12 @@ C_OBJECTS += event_groups.o
C_OBJECTS += list.o C_OBJECTS += list.o
C_OBJECTS += stream_buffer.o C_OBJECTS += stream_buffer.o
C_OBJECTS += timers.o C_OBJECTS += timers.o
<<<<<<< HEAD
C_OBJECTS += heap_1.o C_OBJECTS += heap_1.o
=======
C_OBJECTS += standardMemMang.o
C_OBJECTS += hooks.o
>>>>>>> 3627358... Removed old test files
# Objects build from assembly source files # Objects build from assembly source files
ASM_OBJECTS = board_fstartup.o ASM_OBJECTS = board_fstartup.o
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment