commit 9b6197ec4a87883acd177a86b85156a42a868ca9
author Deepesh Garg <deepeshgarg6@gmail.com> Sun May 15 20:42:34 2022 +0530
committer GitHub <noreply@github.com> Sun May 15 20:42:34 2022 +0530
tree 1d448a107f367cad7163da9b5679a582aadf5a88
parent 03b133520b0a0b4e9f19b64210139110467644d1

chore: resolve conflicts

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 36fbdb6..e0f0c98 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,25 +2,7 @@
 
 import frappe
 
-<<<<<<< HEAD
 __version__ = "14.0.0-dev"
-=======
-from erpnext.hooks import regional_overrides
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-__version__ = "13.27.1"
->>>>>>> 096dcf0e54 (chore(release): Bumped to Version 13.27.1)
-=======
-__version__ = "13.28.0"
->>>>>>> 8cc2ea0ddb (chore(release): Bumped to Version 13.28.0)
-=======
-__version__ = "13.29.0"
->>>>>>> 7369db59aa (chore(release): Bumped to Version 13.29.0)
-=======
-__version__ = "13.27.0"
->>>>>>> 5b02b5b3cd (chore: Remove unintended changes)
 
 
 def get_default_company(user=None):