Resolve spec/factories/groups.rb[ci skip]

a2d8103c · Valery Sizov · 17200ac3 · a2d8103c
Commit a2d8103c authored May 08, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/factories/groups.rb spec/factories/groups.rb +0 -3

No files found.
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -21,7 +21,6 @@ FactoryGirl.define do
      avatar { File.open(Rails.root.join('spec/fixtures/dk.png')) }
    end
-<<<<<<< HEAD
    factory :group_with_members do
      after(:create) do |group, evaluator|
        group.add_developer(create :user)
@@ -45,8 +44,6 @@ FactoryGirl.define do
      end
    end
-=======
->>>>>>> 6ce1df41e175c7d62ca760b1e66cf1bf86150284
    trait :access_requestable do
      request_access_enabled true
    end