From 0f71a749ac98b2c11082fee53178c246ac5333f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Wed, 27 Oct 2021 15:54:21 +0200
Subject: [PATCH] fix gemfile.lock
---
Gemfile.lock | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 75035b78d..d85d58665 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
--
GitLab