1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00

Merge ad422250db859fa859c1d2393e454a967a77a65c into dev

This commit is contained in:
github-actions[bot] 2020-08-04 07:58:01 +00:00 committed by GitHub
commit a728817fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -215,6 +215,7 @@ def docs_merge_to_release_branch(v):
title("docs: merge to release branch")
cmd('git co release/v7 --')
cmd('git clean -fd .')
cmd('rm -f LVGL.pdf') #To avoide possible merge conflict
cmd('git merge latest')
cmd('git push origin release/v7')