# Conflicts:
#	docs/apidocs/data.html
#	docs/apidocs/downloads.html
#	docs/apidocs/drip-api-gwt-json-overlay.jar
#	docs/apidocs/drip-api-js.zip
#	docs/apidocs/drip-api-json-client-json-sources.jar
#	docs/apidocs/drip-api-json-client.jar
#	docs/apidocs/drip-api-php.zip
#	docs/apidocs/drip-api-xml-client-xml-sources.jar
#	docs/apidocs/drip-api-xml-client.jar
#	docs/apidocs/drip-api.rb
#	docs/apidocs/index.html
#	docs/apidocs/json_AnsibleOutput.html
#	docs/apidocs/json_AnsibleResult.html
#	docs/apidocs/json_DeployResponse.html
#	docs/apidocs/json_Invocation.html
#	docs/apidocs/json_OwnedObject.html
#	docs/apidocs/json_Result_.html
#	docs/apidocs/ns0.xsd
#	docs/apidocs/resource_DeployController.html
#	docs/apidocs/syntax_json.html
#	docs/apidocs/syntax_xml.html
#	docs/apidocs/xml_ns0_ansibleOutput.html
#	docs/apidocs/xml_ns0_ansibleResult.html
#	docs/apidocs/xml_ns0_deployResponse.html
#	docs/apidocs/xml_ns0_invocation.html
#	drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
#	drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/DeployResponse.java