commiting merge

keel-hq · Mar 31, 2018 · 63a9c5d · 63a9c5d
1 parent a060b90
commit 63a9c5d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/chart/keel/values.yaml b/chart/keel/values.yaml
@@ -4,11 +4,7 @@
 
 image:
   repository: keelhq/keel
-<<<<<<< HEAD
   tag: 0.8.3
-=======
-  tag: 0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
   pullPolicy: IfNotPresent
 
 # Enable insecure registries

diff --git a/deployment/deployment-norbac.yaml b/deployment/deployment-norbac.yaml
@@ -30,11 +30,7 @@ spec:
     spec:
       serviceAccountName: keel
       containers:
-<<<<<<< HEAD
         - image: keelhq/keel:0.8.3
-=======
-        - image: karolisr/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
           imagePullPolicy: Always
           env:
             # - name: POLL

diff --git a/deployment/deployment-rbac.yaml b/deployment/deployment-rbac.yaml
@@ -86,11 +86,7 @@ spec:
     spec:
       serviceAccountName: keel
       containers:
-<<<<<<< HEAD
         - image: keelhq/keel:0.8.3
-=======
-        - image: karolisr/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
           imagePullPolicy: Always
           env:
             # - name: POLL

diff --git a/hack/deployment.sample.yml b/hack/deployment.sample.yml
@@ -16,11 +16,7 @@ spec:
     spec:
       serviceAccountName: keel
       containers:
-<<<<<<< HEAD
         - image: keelhq/keel:0.8.3
-=======
-        - image: keelhq/keel:0.8.0
->>>>>>> cf8d4d3cca5e99a3e4bea2845d71ac354fc730de
           imagePullPolicy: Always
           env:
             # - name: POLL