From 05269f92990d0e0fd0c2fc1d62f823e6a17bd473 Mon Sep 17 00:00:00 2001 From: ArmandBahi <armand.bahi@veremes.com> Date: Thu, 18 Oct 2018 12:48:53 +0200 Subject: [PATCH] Modify symlinks strategy --- .gitignore | 23 ++--------------------- README.md | 4 ++++ src/module_anc/module/lang/lang-en.json | 0 src/module_anc/module/lang/lang-fr.json | 0 4 files changed, 6 insertions(+), 21 deletions(-) mode change 100755 => 100644 src/module_anc/module/lang/lang-en.json mode change 100755 => 100644 src/module_anc/module/lang/lang-fr.json diff --git a/.gitignore b/.gitignore index 9d50ce69..ef1619da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,6 @@ -# client -# vas +vas/ +client/ conf/closure conf/node_modules/ conf/properties.json src/closure/conf/depswriter/ -# src/vitis/client/javascript/*.js* - -vas/ -client/ - -# vas/log/ -# vas/public/ -# vas/server/ -# vas/ws_data/ -# vas/tmp/ -# vas/shared/ -# vas/upload/ - -# src/vitis/client/modules/ -# ! src/vitis/client/modules/vitis/ -# src/vitis/vas/rest/ws/* -# ! src/vitis/vas/rest/ws/vitis/ -# src/vitis/vas/sql/* -# ! src/vitis/vas/sql/sqlQueries.xml diff --git a/README.md b/README.md index 66a090fa..b024e127 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD # vMap vMap is a powerfull webmapping application based on the newest open-source libraries (OpenLayers 3, Google-Closure, AngularJS, Bootstrap…). @@ -22,3 +23,6 @@ To install the dev version of this project run the following steps: - Run install.sh and give the var/www/[app name] path when asked to build your tree structure - Now you have the correct versioned tree structure, rename var/www/[app name] as var/www/[app name]\_vai and var/www/[app name]\_dev as var/www/[app name] - Run `git pull` and `git push` to update/post the project and his dependencies +======= +Module ANC 2018.03.00 for Vitis +>>>>>>> 3ce44dcc... Squashed 'src/module_anc/' changes from 4321adc4..8bb35778 diff --git a/src/module_anc/module/lang/lang-en.json b/src/module_anc/module/lang/lang-en.json old mode 100755 new mode 100644 diff --git a/src/module_anc/module/lang/lang-fr.json b/src/module_anc/module/lang/lang-fr.json old mode 100755 new mode 100644 -- GitLab