From 14a328f4cd19101ba3d8a47edf98ed352413f6b0 Mon Sep 17 00:00:00 2001
From: "R.A. Stern" <rastern@users.noreply.github.com>
Date: Wed, 17 Jun 2020 00:50:07 -0400
Subject: [PATCH] Fix about

---
 vmtconnect/__about__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vmtconnect/__about__.py b/vmtconnect/__about__.py
index e32aad7..d606972 100644
--- a/vmtconnect/__about__.py
+++ b/vmtconnect/__about__.py
@@ -13,11 +13,7 @@
 
 __title__ = 'vmtconnect'
 __description__ = 'Turbonomic API Client'
-<<<<<<< HEAD
-__version__ = '3.2.3'
-=======
 __version__ = '3.2.4'
->>>>>>> release-v3.2.4
 __author__ = 'R.A. Stern'
 __author_email__ = 'richard.stern@turbonomic.com'
 __license__ = 'Apache 2.0'