Merge branch 'develop' into fix/channel-selection

laevandus · web-flow · commit 3655029edbad · 2024-10-01T09:39:36.000+03:00
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -126,8 +126,6 @@ lane :publish_release do |options|
   )
 
   update_spm(version: release_version)
-
-  merge_main
 end
 
 private_lane :appstore_api_key do

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,6 @@ lane :publish_release do \|options\|`
`126`	`126`	`)`
`127`	`127`
`128`	`128`	`update_spm(version: release_version)`
`129`		`-`
`130`		`- merge_main`
`131`	`129`	`end`
`132`	`130`
`133`	`131`	`private_lane :appstore_api_key do`