mirror of https://github.com/ARMmbed/mbed-os.git
Merge branch 'dev_trailing_spaces_removal' of git://github.com/0xc0170/mbed into 0xc0170-dev_trailing_spaces_removal
Conflicts: workspace_tools/toolchains/__init__.py workspace_tools/toolchains/arm.pypull/344/head
commit
bb120221fb
|
@ -60,3 +60,6 @@ debug.log
|
|||
|
||||
# Ignore OS X Desktop Services Store files
|
||||
.DS_Store
|
||||
|
||||
# Orig diff files
|
||||
*.orig
|
||||
|
|
Loading…
Reference in New Issue