mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-09-04 02:53:07 +02:00
fix conflict
This commit is contained in:
parent
53390a1f23
commit
80e60ede1a
1 changed files with 1 additions and 0 deletions
1
.github/workflows/flatpak-build.yml
vendored
1
.github/workflows/flatpak-build.yml
vendored
|
@ -31,6 +31,7 @@ jobs:
|
|||
git checkout dev
|
||||
echo "Слияние изменений из upstream/dev..."
|
||||
git merge upstream/dev --no-edit
|
||||
git pull --rebase origin dev
|
||||
git push origin dev
|
||||
|
||||
- name: Get latest version and create release tag
|
||||
|
|
Loading…
Add table
Reference in a new issue