hapi-fhir/.gitignore.orig at 32ad3ab22ce4ee7ec677c9cf71cb32eaa0301dcb - hapi-fhir - iSharkFly SRC

honeymoose/hapi-fhir

mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-05 20:48:15 +00:00

jamesagnew 66bb291e04 Merge branch 'master' of github.com:jamesagnew/hapi-fhir

Conflicts:
	examples/pom.xml.orig
	hapi-deployable-pom/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
	hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
	hapi-fhir-structures-dev/.gitignore
	hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/CustomObservation.java
	hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
	pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/.settings/org.eclipse.wst.common.component.orig
	src/changes/changes.xml
	src/site/resources/svg/restful-server-interceptors.svg
	src/site/site.xml

2014-11-08 10:58:35 -05:00

8 lines

111 B

Plaintext

Raw Blame History

 /target/
 <<<<<<< HEAD
 /.settings/
 .classpath
 .project
 =======
 >>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2