From 4a55560cad4aaebcc2ca34c6c71aae52534a0a8a Mon Sep 17 00:00:00 2001
From: finpaul <johnston.paul.lewis@gmail.com>
Date: Tue, 14 Nov 2023 15:40:44 -0700
Subject: [PATCH] update setup.py

---
 setup.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index cc1461cde..622ee9994 100644
--- a/setup.py
+++ b/setup.py
@@ -7,11 +7,7 @@
 
 setup(
     name="fiscalsim-us",
-<<<<<<< HEAD
-    version="0.1.6",
-=======
-    version="0.2.3",
->>>>>>> origin/main
+    version="0.2.6",
     author="Center for Growth and Opportunity at Utah State University (CGO)",
     author_email="fiscalsim@thecgo.org",
     long_description=readme,