From 3d20f21dca3f1c4459970365a2628b04563202f4 Mon Sep 17 00:00:00 2001
From: sachinganesh <sachin.ganesh@bizgaze.in>
Date: Fri, 9 Dec 2022 18:09:01 +0530
Subject: [PATCH] m

---
 assets/js/setting.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/assets/js/setting.js b/assets/js/setting.js
index 35362c3..1068704 100644
--- a/assets/js/setting.js
+++ b/assets/js/setting.js
@@ -1,8 +1,5 @@
 export function _serverUrl() {
-<<<<<<< HEAD
     // sachin commitw
-=======
     // sudheer 1.0 new branch
->>>>>>> 3f581491210a99ac539a898f1cccb5f8fbdb5815
     return 'http://localhost:3086/';
 }
\ No newline at end of file