Resolve app/controllers/projects/clusters_controller.rb

7f774f7b · Dennis Tang · 93151038 · 7f774f7b
Commit 7f774f7b authored Jul 05, 2018 by Dennis Tang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/projects/clusters_controller.rb app/controllers/projects/clusters_controller.rb +0 -3

No files found.
--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
 class Projects::ClustersController < Projects::ApplicationController
-<<<<<<< HEAD
  prepend EE::Projects::ClustersController

-=======
->>>>>>> upstream/master
  before_action :cluster, except: [:index, :new, :create_gcp, :create_user]
  before_action :authorize_read_cluster!
  before_action :generate_gcp_authorize_url, only: [:new]