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