Merge branch 'master' into dev

Conflicts: bin/oref0-setup.sh package.json
openaps · Jul 14, 2017 · 02418ac · 02418ac
2 parents ace821f + 5dfd444
commit 02418ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/bin/oref0-setup.sh b/bin/oref0-setup.sh
@@ -728,7 +728,6 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
             make && sudo make install && echo && touch /tmp/reboot-required && echo mraa installed. Please reboot before using. && echo ) || die "Could not compile mraa"
             sudo bash -c "grep -q i386-linux-gnu /etc/ld.so.conf || echo /usr/local/lib/i386-linux-gnu/ >> /etc/ld.so.conf && ldconfig" || die "Could not update /etc/ld.so.conf"
         fi
-        fi
     fi
 
     echo Checking openaps dev installation

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oref0",
-  "version": "0.5.0-dev",
+  "version": "0.4.3",
   "description": "openaps oref0 reference implementation of the reference design",
   "scripts": {
     "test": "make test",