Resolve conflict in app/models/concerns/deployment_platform.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/models/concerns/deployment_platform.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
a148aa35 · Rémy Coutable · 8c7bee0e · a148aa35
Commit a148aa35 authored Jan 05, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/models/concerns/deployment_platform.rb app/models/concerns/deployment_platform.rb +0 -4

No files found.
--- a/app/models/concerns/deployment_platform.rb
+++ b/app/models/concerns/deployment_platform.rb
 module DeploymentPlatform
-<<<<<<< HEAD
  def deployment_platform(environment: nil)
-=======
-  def deployment_platform
->>>>>>> upstream/master
    @deployment_platform ||=
      find_cluster_platform_kubernetes ||
      find_kubernetes_service_integration ||