Skip to content
Snippets Groups Projects
Unverified Commit 0f71a749 authored by Sébastien Gaya's avatar Sébastien Gaya
Browse files

fix gemfile.lock

parent 76dddb28
No related branches found
No related tags found
No related merge requests found
......@@ -330,11 +330,7 @@ GEM
simple_form_bs5_file_input (0.0.3)
rails
simple_form
<<<<<<< HEAD
simple_form_password_with_hints (0.0.4)
=======
simple_form_password_with_hints (0.0.3)
>>>>>>> 353f910894520e230e8ba00dd407158a1901b980
rails
simple_form
sinatra (2.1.0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment