Financial-Times / smartlogic-notifier

90%

master: 70%

LAST BUILD ON BRANCH feature/UPPSFT-1517-fix-merge-conflicts

branch: feature/UPPSFT-1517-fix-merge-conflicts

CHANGE BRANCH

x

Reset

• feature/UPPSFT-1517-fix-merge-conflicts
• 10pct-circle2
• Feature/UPPSF-5839-add-specialist-model
• Feature/progress-datacloud-migration
• Fix/UPPSF-5423
• UPPSF-1313-add-publish-configs
• UPPSF-6365
• add-more-debug-logs
• add-smartlogicHealthcheckConcept-to-eks-app-configs
• addShortLabelToRequest
• chore/UPPSF-6437-go125-upgrade
• dependabot/go_modules/golang.org/x/crypto-0.35.0
• dependabot/go_modules/golang.org/x/crypto-0.45.0
• dependabot/go_modules/golang.org/x/net-0.38.0
• deploy-on-push/k8s/fix-notify
• feature/UPPSF-1309-history-req
• feature/UPPSF-3295-migrate-to-msk
• feature/UPPSF-4288-kafka-monitoring
• feature/UPPSF-5512
• feature/UPPSF-5863-setup-for-internal-dependencies
• feature/UPPSF-786-update-kafka-lib
• feature/UPPSF-800-optimise-update-handling
• feature/UPPSF-807-add-get-concepts-endpoint
• feature/UPPSF-858-add-time-constraint
• feature/create-location-notifier
• feature/switch_to_doppler
• fix/CPH-267-config-cleanup
• fix/CPH-97-alpineupdate
• fix/CPH-97-updatealpine
• fix/UPPSF-1178-upgrade-gorilla-handlers
• fix/UPPSF-1181-add-runbook-UPPSF-2030-update-codeowners
• fix/UPPSF-1255-change-timeout
• fix/UPPSF-1308-health-concept
• fix/UPPSF-1405-log-failed
• fix/UPPSF-1518-sl-timing-issue
• fix/UPPSF-500-healthcheck-frequency
• fix/UPPSF-860-notify-since-endpoint
• fix/datetime-parsing
• fix/ignore-conceptscheme
• fix/pr-template-15901
• fix/set-formatter
• functional-implementation
• hc-changes
• helmify
• master
• refactor/minor-fixes
• runbook-no-relationships-2021-03-19
• snyk-cli-scan
• use-something-that-exists

Fix for merge conflict