From cb0e8dba2cb3b5d6e9acf63c8e53f50a6b9aac41 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 15 Oct 2010 07:56:02 +0000 Subject: [PATCH] Add proper default values for 'merge' attributes in collection elements (SPR-7656) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3766 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../beans/factory/xml/spring-beans-3.0.xsd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd index ee24bd1b3f9..dce67a3b755 100644 --- a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd +++ b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd @@ -864,7 +864,7 @@ - + - + - + - + - +