rebase

Signed-off-by: francostellari <[email protected]>
kubestellar · May 23, 2024 · 4a66268 · 4a66268
1 parent b6db0b2
commit 4a66268
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -3,21 +3,9 @@
 # Declare variables to be passed into your templates.
 
 # Set the controller verbosity
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3cd0aab (transpose)
 controller:
   verbosity: 2
 
 # Set the agent verbosity
 agent:
   verbosity: 2
-<<<<<<< HEAD
-=======
-verbosity:
-  controller: 2
-  agent: 2
->>>>>>> bc24c0b (Add agent verbosity)
-=======
->>>>>>> 3cd0aab (transpose)