Skip to content
Snippets Groups Projects
Commit 16efe2c6 authored by harshit aggarwal's avatar harshit aggarwal
Browse files

resolving conflicts

parents 0304dce6 5251fd49
No related branches found
No related tags found
No related merge requests found
......@@ -44,4 +44,4 @@ global:
defaultCpuRequests: "0.5"
defaultMemoryRequests: "4Gi"
defaultCpuLimits: "1"
defaultMemoryLimits: "4Gi"
defaultMemoryLimits: "4Gi"
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment