Skip to content
Snippets Groups Projects
Commit dfc922c3 authored by Alok Joshi's avatar Alok Joshi
Browse files

resolve conflict

parents 2f5e0d33 de393d94
No related branches found
No related tags found
4 merge requests!760Vulnerability fixes,!745Draft: M18 Upgraded packages to mitigate vulns in netty, guava, snakeyaml,!744Upgraded packages to mitigated vulns in netty, guava, snakeyaml,!639Extend patch API to support data block modification
Pipeline #174736 failed
Stage: build
Stage: scan
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 17 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment