Auto stash before merge of "master" and "origin/master"

achlysproject · Aug 8, 2018 · cb0e8fb · cb0e8fb
1 parent 6367beb
commit cb0e8fb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/rebar.config b/rebar.config
@@ -49,16 +49,16 @@
     ]},
     {toolchain, [
       % {root, "/home/laymer/NewGRiSP/grisp-software/rtems-install/rtems/5"}
-      % {root, "/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}
+      {root, "/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}
       % {root, "/Users/oxynad/Documents/thesis/newGRiSP/grisp-software/rtems-install/rtems/5"}
-      {root, "/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"} % W540
+      % {root, "/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}
       % {root, "/media/alex/external1/grisp/grisp-software/rtems-install/rtems/5"}
     ]},
     {build, [
         {toolchain, [
           % {directory,"/home/laymer/NewGRiSP/grisp-software/rtems-install/rtems/5"}]}
-          % {directory,"/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}]}
-          {directory,"/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}]} % W540
+          {directory,"/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}]}
+          % {directory,"/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}]} % Igor
           % {directory,"/Users/oxynad/Documents/thesis/newGRiSP/grisp-software/rtems-install/rtems/5"}]} % Dan
           % {directory,"/media/alex/external1/grisp/grisp-software/rtems-install/rtems/5"}]}
           % {directory,"/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}]}