diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2021-01-29 09:15:47 -0500 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2021-01-29 09:15:47 -0500 |
| commit | 2a3fd2bedae3d79b96f57601289386dc3aec9fa1 (patch) | |
| tree | d04e33dbf1ebc9c77e9222ba447a7e5bf77a4f83 /Cartfile.private | |
| parent | 8a6389dc08dcd269142755f218de2be2c4c66c21 (diff) | |
| parent | 453d47f44c4ee682ef332afe2153de48c8127374 (diff) | |
| download | sdl_ios-2a3fd2bedae3d79b96f57601289386dc3aec9fa1.tar.gz | |
Merge branch 'develop' into feature/issue-1898-menu-manager-refactor
# Conflicts:
# Cartfile.private
Diffstat (limited to 'Cartfile.private')
| -rw-r--r-- | Cartfile.private | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Cartfile.private b/Cartfile.private index 6eb659334..a261ab097 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "Quick/Quick" ~> 3.0 github "Quick/Nimble" ~> 9.0 -github "erikdoe/ocmock" ~> 3.7
\ No newline at end of file +github "erikdoe/ocmock" ~> 3.7 |