updae

Churchill427 · Churchill427 · commit 6d95bc1f4788 · 2025-05-18T17:58:38.000+05:30
diff --git a/sql_queries/updates_on_land_forms.sql b/sql_queries/updates_on_land_forms.sql
@@ -65,11 +65,7 @@ const updateQuery = `
     form_lands.any_other_works = ?, 
     form_lands.p_contribution = ?, 
     form_lands.f_contribution = ?, 
-<<<<<<< HEAD
     form_lands.total_est = ?
-=======
-    form_lands.total_est = ?, 
->>>>>>> 73b073d6017cd82b080d27cef0df657febbcdcd8
 
 
   WHERE 
