Merge remote-tracking branch 'upstream/pull/2134'

[rails.git] / test / controllers / api_controller_test.rb

diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb
index 11d850ac35f67edfab51a043b96b9970005cccd5..cdc20a1aad0d0de4cfea0796e1b904ca7329550b 100644 (file)
--- a/test/controllers/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
 require "test_helper"

-require "api_controller"

 
 class ApiControllerTest < ActionController::TestCase
   def setup
 
 class ApiControllerTest < ActionController::TestCase
   def setup