fixing wrong merge with master

Leandro Santos
1 parent a1b9e20d
Showing 1 changed file with 0 additions and 3 deletions Show diff stats
test/unit/api/helpers_test.rb
@@ -205,7 +205,6 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     filter_disabled_plugins_endpoints
   end
  
-<<<<<<< HEAD
   should 'find all published articles on environment' do
     #user = create_user('someuser')
     #p = fast_create(Profile)
@@ -219,8 +218,6 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     #assert_equals [article1, article2], present_articles
   end
  
-=======
->>>>>>> master
   should 'not touch in options when no fields parameter is passed' do
     model = mock
     expects(:present).with(model, {})
...	...	@@ -205,7 +205,6 @@ class APIHelpersTest < ActiveSupport::TestCase
205	205	filter_disabled_plugins_endpoints
206	206	end
207	207
208		-<<<<<<< HEAD
209	208	should 'find all published articles on environment' do
210	209	#user = create_user('someuser')
211	210	#p = fast_create(Profile)
...	...	@@ -219,8 +218,6 @@ class APIHelpersTest < ActiveSupport::TestCase
219	218	#assert_equals [article1, article2], present_articles
220	219	end
221	220
222		-=======
223		->>>>>>> master
224	221	should 'not touch in options when no fields parameter is passed' do
225	222	model = mock
226	223	expects(:present).with(model, {})
...	...