diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-15 23:10:49 +0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 06:46:38 +0400 |
| commit | 128f2845770b7a6d553ee764cdbbe63da5ba9e84 (patch) | |
| tree | fd0bced6c63c0b55df3beb78361325a0996a3ead /spec/factories.rb | |
| parent | 0ef055a4aef76d20668a40717fb33bfe41599cfb (diff) | |
Rebased on 6.0
-Had to do some minor test clean up as well
Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
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 |