fix: Update patches.txt

earthians · Sep 15, 2023 · 2855bdd · 2855bdd
1 parent c1b25a5
commit 2855bdd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/healthcare/patches.txt b/healthcare/patches.txt
@@ -1,7 +1,3 @@
 healthcare.patches.v0_0.setup_abdm_custom_fields
 healthcare.patches.v0_0.set_medical_code_from_field_to_codification_table
-<<<<<<< HEAD
-=======
-healthcare.patches.v15_0.check_version_compatibility_with_frappe
 healthcare.patches.v15_0.set_fee_validity_status
->>>>>>> 871d663 (fix: Enable Fee Validity for existing patients)