From 9b6197ec4a87883acd177a86b85156a42a868ca9 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Sun, 15 May 2022 20:42:34 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/__init__.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 36fbdb6718..e0f0c98e9c 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,25 +2,7 @@ import inspect
 
 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):