teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge branch 'main' into teutat3s

Browse source
This commit is contained in:
teutat3s 2021-10-24 23:42:55 +02:00
parent 5f552149ea 6475e7563f
commit 6c0585edc7
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.drone.yml
View file

@ -22,6 +22,7 @@ steps:
- git checkout -b devos --track origin/devos - git checkout -b devos --track origin/devos
- git merge -X theirs devos/main - git merge -X theirs devos/main
- git push origin devos - git push origin devos
- git remote set-url origin https://git.b12f.io/pub-solar/os.git
- name: "Sync $BRANCH with upstream" - name: "Sync $BRANCH with upstream"
image: alpine/git image: alpine/git