commit 471e27559fde528f025d2ae28066b27b944eb295
author Ameya Shenoy <shenoy.ameya@gmail.com> Mon Jan 29 17:07:57 2018 +0530
committer GitHub <noreply@github.com> Mon Jan 29 17:07:57 2018 +0530
tree 32cec69803b6b16ddc5b3fb33a5a9a082aac6d21
parent 03f6b3e588125d105385093dba55e99659037d6e

conflict fix

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3905215..d300285 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -488,9 +488,6 @@
 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