Minor post-merge cleanup
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3783 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
parent
45e5b46fc2
commit
6e9e1f0946
|
|
@ -9,3 +9,5 @@ org.springframework.test/test-output/
|
|||
build.sh
|
||||
org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.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.core.env.ConfigurableEnvironment;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue