scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
Anton Ignatov 2019-05-07 13:27:57 +02:00
parent d36160386f
commit 72a1c9b9bd
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Gemfile.lock
View file

@ -211,19 +211,11 @@ GEM
diff-lcs (1.3)
discard (1.0.0)
activerecord (>= 4.2, < 6)
<<<<<<< HEAD
docile (1.1.5)
doorkeeper (5.0.0)
railties (>= 4.2)
erubi (1.8.0)
et-orbi (1.1.7)
=======
docile (1.3.1)
doorkeeper (5.1.0)
railties (>= 5)
erubi (1.8.0)
et-orbi (1.2.0)
>>>>>>> master
tzinfo
execjs (2.7.0)
factory_bot (4.8.2)
@ -375,11 +367,7 @@ GEM
puma (3.12.1)
raabro (1.1.6)
rack (2.0.7)
<<<<<<< HEAD
rack-attack (5.4.1)
=======
rack-attack (6.0.0)
>>>>>>> master
rack (>= 1.0, < 3)
rack-proxy (0.6.5)
rack