Merge branch 'master' of https://code.bizgaze.com/dsaisudheer3772/BizgazeUI

# Conflicts: # assets/js/setting.js
2022-12-09 18:05:39 +05:30
parent 38603ec26d 3f58149121
commit fdc4e2dc87
1 changed files with 4 additions and 0 deletions
@@ -1,4 +1,8 @@
 export function _serverUrl() {
+<<<<<<< HEAD
    // sachin commitw
+=======
+    // sudheer 1.0 new branch
+>>>>>>> 3f581491210a99ac539a898f1cccb5f8fbdb5815
    return 'http://localhost:3086/';
 }