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

Fix conflict between DSTU and DEV

This commit is contained in:
James Agnew 2014-10-31 10:35:12 -04:00
parent 60425a003c
commit 567fd1219c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/model/dstu/FhirDev.java → hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/model/dev/FhirDev.java
View File

@ -1,4 +1,4 @@
package ca.uhn.fhir.model.dstu; package ca.uhn.fhir.model.dev;
/* /*
* #%L * #%L
@ -29,8 +29,8 @@ import ca.uhn.fhir.model.dev.resource.Profile;
import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.IResourceProvider;
import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.provider.ServerConformanceProvider; import ca.uhn.fhir.rest.server.provider.dev.ServerConformanceProvider;
import ca.uhn.fhir.rest.server.provider.ServerProfileProvider; import ca.uhn.fhir.rest.server.provider.dev.ServerProfileProvider;
public class FhirDev implements IFhirVersion { public class FhirDev implements IFhirVersion {

2
hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/rest/server/provider/ServerConformanceProvider.java → hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/rest/server/provider/dev/ServerConformanceProvider.java
View File

@ -1,4 +1,4 @@
package ca.uhn.fhir.rest.server.provider; package ca.uhn.fhir.rest.server.provider.dev;
/* /*
* #%L * #%L

2
hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/rest/server/provider/ServerProfileProvider.java → hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/rest/server/provider/dev/ServerProfileProvider.java
View File

@ -1,4 +1,4 @@
package ca.uhn.fhir.rest.server.provider; package ca.uhn.fhir.rest.server.provider.dev;
/* /*
* #%L * #%L