merge conflict

Merge branch 'patch' of https://github.com/pharmaverse/admiral into current_release # Conflicts: # .github/workflows/templates.yml # NEWS.md
pharmaverse · Jan 31, 2024 · 6cc9530 · 6cc9530
2 parents 37c4dca + 2cff3ab
commit 6cc9530
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/.github/workflows/templates.yml b/.github/workflows/templates.yml
@@ -0,0 +1,17 @@
+---
+name: Check Templates
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+      - patch
+
+jobs:
+  templates:
+    name: Check Templates
+    uses: pharmaverse/admiralci/.github/workflows/check-templates.yml@main
+    if: github.event_name == 'pull_request'
+    with:
+      r-version: "4.1"