Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java # src/main/resources/hapi.properties # src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
This commit is contained in:
@@ -18,7 +18,6 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 {
|
||||
@Autowired
|
||||
private DataSource myDataSource;
|
||||
|
||||
|
||||
/**
|
||||
* We override the paging provider definition so that we can customize
|
||||
* the default/max page sizes for search results. You can set these however
|
||||
|
||||
Reference in New Issue
Block a user