mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
* reverted accidentally commited changes
This commit is contained in:
parent
c8315c4270
commit
f9770a72a6
@ -116,9 +116,6 @@ actions piecemeal together existing Clean
|
||||
{
|
||||
# remove all jam targets
|
||||
$(RM) $(>)
|
||||
# empty bin directory (removing target of other projects)
|
||||
rmdir --ignore-fail-on-non-empty bin/$(BOARD)/$(PROJECT)
|
||||
rmdir --ignore-fail-on-non-empty bin/$(BOARD)
|
||||
}
|
||||
|
||||
#
|
||||
|
@ -29,11 +29,8 @@ SubDir TOP sys ;
|
||||
|
||||
Module swtimer : swtimer.c : hwtimer ;
|
||||
Module posix_io : posix_io.c ;
|
||||
<<<<<<< HEAD
|
||||
Module shell : shell.c : hashtable hash_string ;
|
||||
Module ps : ps.c ;
|
||||
=======
|
||||
>>>>>>> 355988f8cfa6d2d86fbdb7993fa6823943ca23c6
|
||||
|
||||
Module auto_init : auto_init.c ;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user