diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 7e0509b51b5..5e6fdf4ae83 100644 --- 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: