Merge pull request #1067 from github/mergeback/v2.1.10-to-main-03e2e3c4

Mergeback v2.1.10 refs/heads/releases/v2 into main
github · May 11, 2022 · c4fdf5f · c4fdf5f
2 parents 38fc5eb + 4f87830
commit c4fdf5f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
@@ -292,7 +292,7 @@ def main():
     conflicted_files = run_git('diff', '--name-only', '--diff-filter', 'U').splitlines()
     if len(conflicted_files) > 0:
       run_git('add', '.')
-    run_git('commit', '--no-edit')
+      run_git('commit', '--no-edit')
 
     # Migrate the package version number from a v2 version number to a v1 version number
     print(f'Setting version number to {version}')