Merge origin/uat into dev to resolve promotion conflicts
Accept uat version for all conflicting files. Removes files deleted in uat (e2e-ci-runner-rbac.yaml, deploy/teardown-e2e-headlamp.sh). Resolves merge conflict blocking PR #163. Adds trailing newline to audit-ci.jsonc. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
+1
-1
@@ -17,4 +17,4 @@
|
||||
"reason": "lodash code injection via _.template: devDependency only, does not ship in production plugin bundle"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user