Skip to content

Commit ff2f82f

Browse files
committed
Fix removing podspec merge driver
1 parent 882df20 commit ff2f82f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Git/upmerge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ git config merge.podspec-merge-driver.driver "./Submodules/SMF-iOS-CommonProject
2020
git merge origin/$1/master --no-edit
2121

2222
git config --unset merge.ours-driver.driver
23-
git config --unset merge.podspec-merge-driver
23+
git config --unset merge.podspec-merge-driver.driver

0 commit comments

Comments
 (0)