diff --git a/.gitignore b/.gitignore index 9d50ce6960dc645602f546791790a35f6d75356e..ef1619dabeb89c4a1bdc46c55bd84024c9d0a5e9 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 66a090fa24199ddcd24d6ed67926278552a65f74..b024e127ccf7db6f2a5131dfb4ee20769904b986 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