From cb0e8fb7f612a2de2658ef233585e966c7357e7c Mon Sep 17 00:00:00 2001 From: Laymer Date: Wed, 8 Aug 2018 04:24:33 +0200 Subject: [PATCH] Auto stash before merge of "master" and "origin/master" --- rebar.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rebar.config b/rebar.config index 401d4a6..bd5bb33 100644 --- 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"}]}