.github/workflows/ci.yaml in jekyll-theme-fica-0.2.0 vs .github/workflows/ci.yaml in jekyll-theme-fica-0.2.2
- old
+ new
@@ -1,12 +1,19 @@
name: 'Fica testing tool'
on:
push:
branches:
+<<<<<<< HEAD
+ - beta
+ pull_request:
+ branches:
+ - beta
+=======
- main
pull_request:
branches:
- main
+>>>>>>> 91d38cf37714a464d41160dd1513f5ba186f3bca
jobs:
build:
runs-on: ubuntu-latest
strategy: