Colin Adams f11dbd9080 fix merge conflict from master

2013-03-21 15:55:14 +00:00

..

wsf_uri_template_agent_handler.e

…

wsf_uri_template_filter_handler.e

…

wsf_uri_template_helper_for_routed_service.e

…

wsf_uri_template_response_agent_handler.e

…

wsf_uri_template_response_handler.e

…

wsf_uri_template_routed_service.e

fix merge conflict from master

2013-03-21 15:55:14 +00:00

wsf_uri_template_router_helper.e

…

wsf_uri_template_routing_handler.e

…