From: Scott Baker <smbaker@gmail.com>
Date: Tue, 6 Jan 2015 23:13:34 +0000 (-0800)
Subject: conflict resolution
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=8cdb45491dad32696a2506a47556b12ad0be54a4

conflict resolution
---

8cdb45491dad32696a2506a47556b12ad0be54a4
diff --cc planetstack/core/xoslib/up.sh
index 206c0d7,bc2d469..206c0d7
mode 100755,100644..100644
--- a/planetstack/core/xoslib/up.sh
+++ b/planetstack/core/xoslib/up.sh