This repo is the primary development home for OpenShot Video Editor (version 2+), a PyQt video editing application which utilizes the powerful libopenshot C++ library.
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Bumps eps1lon/actions-label-merge-conflict from 2.0.1 to 2.1.0.
Release notes
Sourced from eps1lon/actions-label-merge-conflict's releases.
Changelog
Sourced from eps1lon/actions-label-merge-conflict's changelog.
Commits
fd1f295feat: Addressset-outputdeprecation (#92)f460131chore(deps): update dependency@actions/githubto v5.1.1 (#78)4d757c0test: Run action on Node 16 (#90)cf6c16fchore(deps): update dependency prettier to v2.7.1 (#79)c456feachore(deps): update actions/setup-node action to v3 (#77)534959cchore(deps): update actions/checkout action to v3 (#80)4a43ae0chore(deps): update dependency typescript to v4.5.5 (#74)a066a74chore(deps): update dependency typescript to v4.5.4 (#73)725d517chore(deps): update dependency prettier to v2.5.1 (#71)a1f953echore(deps): update dependency typescript to v4.5.3 (#72)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)