diff options
Diffstat (limited to 'spec/factories.rb')
| -rw-r--r-- | spec/factories.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index 3082e86f07f..b5f786dcd4c 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,8 +1,4 @@ -<<<<<<< HEAD include ActionDispatch::TestProcess -======= -require Rails.root.join('spec', 'support', 'test_env.rb') ->>>>>>> Merge Request on forked projects FactoryGirl.define do sequence :sentence, aliases: [:title, :content] do |