Resolve app/models/namespace.rb conflict

7101f455 · Marin Jankovski · 9aafddcb · 7101f455
Commit 7101f455 authored Feb 06, 2018 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

app/models/namespace.rb app/models/namespace.rb +1 -3

No files found.
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -230,13 +230,11 @@ class Namespace < ActiveRecord::Base
    has_parent?
  end

-<<<<<<< HEAD
+  ## EE only
  def multiple_issue_boards_available?(user = nil)
    feature_available?(:multiple_issue_boards)
  end

-=======
->>>>>>> upstream/master
  def full_path_was
    if parent_id_was.nil?
      path_was