From 4f16d17d2181289c64885e636653cd3bc23ad187 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Mon, 22 Apr 2019 14:48:15 +0530
Subject: [PATCH] fix: resolve conflicts

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index faff5c4ffec..c6672e9af3b 100755
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -591,8 +591,5 @@ erpnext.patches.v11_0.make_italian_localization_fields # 26-03-2019
 erpnext.patches.v11_1.make_job_card_time_logs
 erpnext.patches.v11_1.set_variant_based_on
 erpnext.patches.v11_1.woocommerce_set_creation_user
-<<<<<<< HEAD
 erpnext.patches.v11_1.set_salary_details_submitable
-=======
 erpnext.patches.v11_1.delete_bom_browser
->>>>>>> fix: (Patch) Removed page Bom-Browser