conflict resolution

[plstackapi.git] / planetstack / core / xoslib / up.sh

diff --git a/planetstack/core/xoslib/up.sh b/planetstack/core/xoslib/up.sh
old mode 100755 (executable)
new mode 100644 (file)