Release version 2.0.0.beta1

thoughtbot · Apr 11, 2019 · 1f1a125 · 1f1a125
1 parent dc89a70
commit 1f1a125
Show file tree

Hide file tree

Showing 3 changed files with 151 additions and 30 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,10 @@
 PATH
   remote: .
   specs:
-<<<<<<< HEAD
-    clearance (1.17.0)
-      actionmailer (>= 3.1)
-      activemodel (>= 3.1)
-      activerecord (>= 3.1)
-=======
-    clearance (2.0.0.alpha)
+    clearance (2.0.0.beta1)
       actionmailer (>= 4.2)
       activemodel (>= 4.2)
       activerecord (>= 4.2)
->>>>>>> Stop supporting older versions of Ruby and Rails
       bcrypt
       email_validator (~> 1.4)
       railties (>= 4.2)