zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-28 13:36:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed conflict

Browse source
This commit is contained in:
oleghasjanov 2024-11-08 12:46:39 +02:00
parent 81512dff65
commit 0a08d77b1c
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Gemfile.lock
View file

@ -329,13 +329,10 @@ GEM
money (~> 6.13.2) money (~> 6.13.2)
railties (>= 3.0) railties (>= 3.0)
msgpack (1.7.2) msgpack (1.7.2)
<<<<<<< HEAD
net-ftp (0.3.7) net-ftp (0.3.7)
net-protocol net-protocol
time time
=======
mutex_m (0.2.0) mutex_m (0.2.0)
>>>>>>> 5f9bc1f5e (fixed method for check force delete)
net-protocol (0.1.3) net-protocol (0.1.3)
timeout timeout
net-smtp (0.3.3) net-smtp (0.3.3)
@ -385,13 +382,8 @@ GEM
pry (0.14.2) pry (0.14.2)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
<<<<<<< HEAD
public_suffix (5.0.0)
puma (5.6.9)
=======
public_suffix (6.0.1) public_suffix (6.0.1)
puma (5.6.8) puma (5.6.8)
>>>>>>> 5f9bc1f5e (fixed method for check force delete)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.8.1) racc (1.8.1)
rack (2.2.9) rack (2.2.9)
@ -628,8 +620,4 @@ DEPENDENCIES
wkhtmltopdf-binary (~> 0.12.6.1) wkhtmltopdf-binary (~> 0.12.6.1)
BUNDLED WITH BUNDLED WITH
<<<<<<< HEAD
2.5.15
=======
2.5.19 2.5.19
>>>>>>> 5f9bc1f5e (fixed method for check force delete)