diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index b7a34f3..f53c372 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -1,10 +1,8 @@ on: [push] jobs: test: -<<<<<<< HEAD runs-on: docker -======= - runs-on: minecrap ->>>>>>> refs/remotes/origin/master + container: + image: cachyos steps: - run: echo All Good