Resolving conflict with app/controllers/projects/variables_controller.rb

4ff5cb8d · Ian Baum · d723b18c · 4ff5cb8d
Commit 4ff5cb8d authored Feb 07, 2018 by Ian Baum
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

-=======
->>>>>>> upstream/master
  before_action :authorize_admin_build!

  def show