diff options
Diffstat (limited to 'macros/buildmacros.sce')
| -rw-r--r-- | macros/buildmacros.sce | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/macros/buildmacros.sce b/macros/buildmacros.sce index 3e65f919..e78b15bb 100644 --- a/macros/buildmacros.sce +++ b/macros/buildmacros.sce @@ -9,15 +9,9 @@ Directories = [ "ASTManagement", ... "GeneralFunctions", ... "SymbolTable", ... "ToolInitialization", ... -<<<<<<< HEAD "Hardware/AVR", ... "Hardware/RasberryPi", ... "ImageProcessing", ... -======= - "Hardware/AVR", ... - "Hardware/RasberryPi", ... - "ImageProcessing", ... ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "Scilab-Arduino"]; |