From 471e27559fde528f025d2ae28066b27b944eb295 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 29 Jan 2018 17:07:57 +0530
Subject: [PATCH] conflict fix

---
 erpnext/patches.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 39052152be..d300285c67 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -488,9 +488,6 @@ erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
 erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
 erpnext.patches.v10_0.update_assessment_plan
 erpnext.patches.v10_0.update_assessment_result
-<<<<<<< HEAD
 erpnext.patches.v10_0.added_extra_gst_custom_field
 erpnext.patches.v10_0.workflow_leave_application #2018-01-24
-=======
 erpnext.patches.v10_0.set_default_payment_terms_based_on_company
->>>>>>> master