merge conflict

Author: ethaaalpha

src/vip_client/__init__.py

@@ -8,7 +8,7 @@
 """
 
 # Informations
-__version__ = "0.1.6"
+__version__ = "0.1.8"
 __license__ = "CECILL-B"
 
 from vip_client.classes import VipSession

src/vip_client/classes/VipLauncher.py

@@ -50,7 +50,7 @@ class VipLauncher():
     # Default file name to save session properties 
     _SAVE_FILE = "session_data.json"
     # Vip portal
-    _VIP_PORTAL = "https://vip.creatis.insa-lyon.fr/"
+    _VIP_PORTAL = "https://vip.creatis.insa-lyon.fr"
     # Mail address for support
     _VIP_SUPPORT = "vip-support@creatis.insa-lyon.fr"
     # Regular expression for invalid characters (i.e. all except valid characters)