Skip to content
Snippets Groups Projects
Commit c35cc38d authored by Armand Bahi's avatar Armand Bahi
Browse files

Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap

parents 6a7cf62c 7b0e04e0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
update.bat
+ 4
− 0
View file @ c35cc38d
...@@ -4,7 +4,11 @@ echo Update Vitis App ...@@ -4,7 +4,11 @@ echo Update Vitis App
call utils/update_tree.bat call utils/update_tree.bat
<<<<<<< HEAD
cd client/conf cd client/conf
=======
cd ../client/conf
>>>>>>> 7b0e04e0777792e9cf713c50f58351a7f721d3af
call grunt call grunt
pause pause
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment