From 16c462d10cba0e268c00e058a673ca6a973ce075 Mon Sep 17 00:00:00 2001
From: Dave Kimura <dave@k-innovations.net>
Date: Thu, 15 Aug 2024 20:06:51 -0400
Subject: [PATCH] fixed merge conflict

---
 Gemfile.lock               | 4 ----
 lib/action_auth/version.rb | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f879081..a314666 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,7 @@
 PATH
   remote: .
   specs:
-<<<<<<< HEAD
     action_auth (1.4.1)
-=======
-    action_auth (1.4.0)
->>>>>>> a6dbc62 (v1.4.0)
       bcrypt (~> 3.1.0)
       rails (~> 7.1)
 
diff --git a/lib/action_auth/version.rb b/lib/action_auth/version.rb
index bb096af..600e2c2 100755
--- a/lib/action_auth/version.rb
+++ b/lib/action_auth/version.rb
@@ -1,7 +1,3 @@
 module ActionAuth
-<<<<<<< HEAD
   VERSION = "1.4.1"
-=======
-  VERSION = "1.4.0"
->>>>>>> a6dbc62 (v1.4.0)
 end