# Conflicts: # build.gradle # spring-core/src/main/java/org/springframework/core/convert/Property.java  | 
			||
|---|---|---|
| .. | ||
| src | ||
| spring-messaging.gradle | ||
				
					
						
							# Conflicts: # build.gradle # spring-core/src/main/java/org/springframework/core/convert/Property.java  | 
			||
|---|---|---|
| .. | ||
| src | ||
| spring-messaging.gradle | ||