Skip to content

Commit 7bc4c0a

Browse files
authored
Merge pull request #297 from y-yagi/fix_broken_example_app
Fix broken `Gemfile.lock` in the example app
2 parents 3b915c3 + f3dce59 commit 7bc4c0a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

examples/rails_app/Gemfile.lock

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
PATH
22
remote: ../..
33
specs:
4-
<<<<<<< Updated upstream
5-
openapi_first (2.1.0)
6-
=======
74
openapi_first (2.1.1)
8-
>>>>>>> Stashed changes
95
hana (~> 1.3)
106
json_schemer (>= 2.1, < 3.0)
117
multi_json (~> 1.15)

0 commit comments

Comments
 (0)