12 lines
402 B
Ruby
12 lines
402 B
Ruby
require 'test_helper'
|
|
|
|
<<<<<<< HEAD:test/unit/relative_memo_to_open_source_project_test.rb
|
|
class RelativeMemoToOpenSourceProjectTest < ActiveSupport::TestCase
|
|
=======
|
|
class WebFooterCompaniesControllerTest < ActionController::TestCase
|
|
>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/functional/web_footer_companies_controller_test.rb
|
|
# test "the truth" do
|
|
# assert true
|
|
# end
|
|
end
|