commit 03b133520b0a0b4e9f19b64210139110467644d1
author Deepesh Garg <deepeshgarg6@gmail.com> Sun May 15 16:42:34 2022 +0530
committer Mergify <37929162+mergify[bot]@users.noreply.github.com> Sun May 15 15:04:23 2022 +0000
tree eb41209297dfe601932bf65a44293c36b0cc8fb8
parent 4ca7a3de4e7c0493b13819fdd8013920805a9b55

chore: Remove unintended changes

(cherry picked from commit 5b02b5b3cd98a20a5a07dd83280acd548998ebf0)

# Conflicts:
#	erpnext/__init__.py

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 85db714..36fbdb6 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -9,6 +9,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 __version__ = "13.27.1"
 >>>>>>> 096dcf0e54 (chore(release): Bumped to Version 13.27.1)
 =======
@@ -17,6 +18,9 @@
 =======
 __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):