fix: let's wait for branch cache

Required-githooks: true Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
daos-stack · Oct 28, 2024 · 66cac3b · 66cac3b
1 parent d045171
commit 66cac3b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -6,11 +6,7 @@ name: Trivy scan
 on:
   workflow_dispatch:
   schedule:
-<<<<<<< HEAD
-    - cron: '45 8 * * *'
-=======
-    - cron: '0 0 * * *'
->>>>>>> SRE-2525-trivy
+    - cron: '5 0 * * *'
   push:
     branches: ["master", "release/**"]
   pull_request: