fix conflicts

linkernetworks · Aug 8, 2018 · 00e2b0f · 00e2b0f
1 parent 20c76ac
commit 00e2b0f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/deploy/helm/config/development.yaml b/deploy/helm/config/development.yaml
@@ -6,13 +6,9 @@ apps:
       replicaCount: 1
       nodeSelector:
         glusterfs: false
-<<<<<<< HEAD
     replicaCount: 1
     controller:
       apiserverImageTag: v0.1.10
-=======
-      apiserverImageTag: v0.1.9
->>>>>>> pull resource setting out
       webappImageTag: v0.1.0
       portalCPU: 50m
       serverCPU: 100m

diff --git a/deploy/helm/config/productaion.yaml b/deploy/helm/config/productaion.yaml
@@ -6,13 +6,9 @@ apps:
       replicaCount: 1
       nodeSelector:
         glusterfs: true
-<<<<<<< HEAD
     replicaCount: 1
     controller:
       apiserverImageTag: v0.1.10
-=======
-      apiserverImageTag: v0.1.9
->>>>>>> pull resource setting out
       webappImageTag: v0.1.0
       portalCPU: 200m
       serverCPU: 100m

diff --git a/deploy/helm/config/testing.yaml b/deploy/helm/config/testing.yaml
@@ -6,13 +6,9 @@ apps:
       replicaCount: 1
       nodeSelector:
         glusterfs: false
-<<<<<<< HEAD
     replicaCount: 1
     controller:
       apiserverImageTag: v0.1.10
-=======
-      apiserverImageTag: v0.1.9
->>>>>>> pull resource setting out
       webappImageTag: v0.1.0
       portalCPU: 50m
       serverCPU: 100m