From: Yasin Date: Mon, 9 Sep 2013 09:27:22 +0000 (+0200) Subject: Fix: conflict config.py X-Git-Tag: myslice-0.2-2~1^2~4 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee60f435987235b078b8b4693a3f916e1fdb83a8;hp=--cc;p=myslice.git Fix: conflict config.py --- ee60f435987235b078b8b4693a3f916e1fdb83a8 diff --cc myslice/config.py index f6285b25,6800b14e..e6c2d25b --- a/myslice/config.py +++ b/myslice/config.py @@@ -10,8 -10,9 +10,8 @@@ class Config # the INRIA setup # manifold_url = "http://manifold.pl.sophia.inria.fr:7080/" # the OpenLab-wide backend as managed by UPMC -# note that dev.myslice.info runs a more unstable code - manifold_url = "http://test.myslice.info:7080/" - +# manifold_url = "http://dev.myslice.info:7080/" # development version - manifold_url = "http://test.myslice.info:7080/" #stable manifol ++ manifold_url = "http://test.myslice.info:7080/" #stable version # exporting these details to js @staticmethod def manifold_js_export ():