[conflict] Resolve merge conflict

This commit is contained in:
2024-10-31 11:00:10 -04:00
parent 2c92cb5342
commit 66e76c2764
4 changed files with 52 additions and 2 deletions

View File

@ -19,3 +19,4 @@ alias chglg="git add ./changelog/ && git commit -m 'Add changelog' && git push"
alias surepayment="portforward 5001"
alias sureroc="portforward 5002"
alias slip="sli dev changelog"
alias deploy_v="ssh vrobbler.service \"rm -rf /usr/local/lib/python3.9/site-packages/vrobbler-0.15.4.dist-info/ && pip install git+https://code.unbl.ink/secstate/vrobbler.git@develop && immortalctl restart vrobbler\""