fixed merge conflict

kobaltz · Aug 16, 2024 · 16c462d · 16c462d
1 parent ffff51c
commit 16c462d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git 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
@@ -1,7 +1,3 @@
 module ActionAuth
-<<<<<<< HEAD
   VERSION = "1.4.1"
-=======
-  VERSION = "1.4.0"
->>>>>>> a6dbc62 (v1.4.0)
 end