From 6f1afa8766ee01b4862ffebdcb717c713787d7c5 Mon Sep 17 00:00:00 2001
From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
Date: Tue, 21 Sep 2021 10:58:18 +0530
Subject: [PATCH] fix: update default KSA VAT rate for setup (#27614)

(cherry picked from commit abded895f3e47ac8ac24117eca998e202a5dba16)

# Conflicts:
#	erpnext/setup/setup_wizard/data/country_wise_tax.json
---
 erpnext/setup/setup_wizard/data/country_wise_tax.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 91e8eff89fd..e87f1787752 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -2121,10 +2121,13 @@
 		"KSA VAT 15%": {
 			"account_name": "VAT 15%",
 			"tax_rate": 15.00
+<<<<<<< HEAD
 		},
 		"KSA VAT 5%": {
 			"account_name": "VAT 5%",
 			"tax_rate": 5.00
+=======
+>>>>>>> abded895f3 (fix: update default KSA VAT rate for setup (#27614))
 		},
 		"KSA VAT Zero": {
 			"account_name": "VAT Zero",