fix conflict

This commit is contained in:
0FL01 2025-07-23 12:03:54 +03:00
parent 53390a1f23
commit 80e60ede1a

View file

@ -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