fix conflicts in app/controllers/projects/variables_controller.rb

0be0cc3b · Mike Greiling · 263be3d4 · 0be0cc3b
Commit 0be0cc3b authored Jul 07, 2017 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

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

-=======
  before_action :variable, only: [:show, :update, :destroy]
->>>>>>> master-ce
  before_action :authorize_admin_build!

  layout 'project_settings'