Merge branch 'dstu3_latest_structs'

hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package org.hl7.fhir.convertors;
 
 /*-
@@ -36,3 +37,22 @@ public interface VersionConvertorAdvisor {
 
   CodeSystem getCodeSystem(ValueSet src);
 }
+=======
+package org.hl7.fhir.convertors;
+
+import org.hl7.fhir.dstu3.model.CodeSystem;
+import org.hl7.fhir.dstu3.model.ValueSet;
+import org.hl7.fhir.exceptions.FHIRException;
+
+public interface VersionConvertorAdvisor {
+  boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src);
+
+  // called ?
+  org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException;
+
+  // called when an r2 value set has a codeSystem in it
+  void handleCodeSystem(CodeSystem tgtcs, ValueSet source);
+
+  CodeSystem getCodeSystem(ValueSet src);
+}
+>>>>>>> dstu3_latest_structs

hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java

@@ -1,6 +1,6 @@
 package org.hl7.fhir.convertors;
 
-/*-
+/*
  * #%L
  * HAPI FHIR - Converter
  * %%