fix/merge-conflict #36

Merged
teutat3s merged 13 commits from refs/pull/36/head into main 2021-10-07 23:53:21 +00:00
2 changed files with 0 additions and 2 deletions
Showing only changes of commit e5660cdf83 - Show all commits

View file

@ -2,7 +2,6 @@ name: "Check & Cachix"
on: on:
push: push:
branches: branches:
- main
- master - master
- trying - trying
- staging - staging

View file

@ -3,7 +3,6 @@ name: Deploy Docs to GitHub Pages
on: on:
push: push:
branches: branches:
- main
- master - master
jobs: jobs: