Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Artemis.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  • Loading branch information
nityanandaz committed Mar 4, 2024
2 parents 84de14d + 8df78a6 commit e5ea4a7
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/ls1intum/apollon-ios-module",
"state" : {
"revision" : "73a3999b4cdcdd0ae2b86426d65a7b75c6ac3af0",
"version" : "1.0.6"
"revision" : "acf45b166f4839ff5ac4f13ea0692add332a6e62",
"version" : "1.0.7"
}
},
{
Expand Down

0 comments on commit e5ea4a7

Please sign in to comment.