honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
hapi-fhir/hapi-fhir-structures-dev/.gitignore.orig

8 lines
111 B
Plaintext
Raw Normal View History

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
/target/
<<<<<<< HEAD
/.settings/
.classpath
.project
=======
>>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2