second time merge

assets/js/setting.js

 export function _serverUrl() {
   // sachin 2.0 commitw
   // sudheer 1.0 new branch
-  // merge request
+  // merge request another time
   return "http://localhost:3088/";
   //return "http://localhost:3086/";
   //return "https://c01.bizgaze.app/";