fixed hound

app/serializers/api/v1/result_serializer.rb

@@ -6,7 +6,8 @@ module Api
       type :results
       attributes :id, :name, :my_module_id, :user_id, :created_at, :updated_at,
                  :archived, :archived_on, :last_modified_by_id, :archived_by_id,
-                 :restored_by_id, :restored_on, :result_text, :result_table, :result_asset
+                 :restored_by_id, :restored_on, :result_text, :result_table,
+                 :result_asset
 
       belongs_to :my_module, serializer: MyModuleSerializer
     end

config/routes.rb

@@ -598,13 +598,10 @@ Rails.application.routes.draw do
               end
             end
           end
-<<<<<<< HEAD
           resources :users, only: %i(show) do
             resources :user_identities,
                       only: %i(index create show update destroy)
           end
-=======
->>>>>>>  Added results endpoint
         end
       end
     end