Minor post-merge cleanup
This commit is contained in:
parent
f480333d31
commit
4214bc0735
|
@ -9,3 +9,5 @@ org.springframework.test/test-output/
|
||||||
build.sh
|
build.sh
|
||||||
org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs
|
org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs
|
||||||
org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs
|
org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs
|
||||||
|
org.springframework.jdbc/derby.log
|
||||||
|
spring-build
|
||||||
|
|
|
@ -18,6 +18,7 @@ package org.springframework.context.support;
|
||||||
|
|
||||||
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
|
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
import org.springframework.core.env.ConfigurableEnvironment;
|
||||||
|
import org.springframework.core.io.ClassPathResource;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue