# Conflicts: # spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java # spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java  | 
			||
|---|---|---|
| .. | ||
| src | ||
| spring-messaging.gradle | ||
				
					
						
							# Conflicts: # spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java # spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java  | 
			||
|---|---|---|
| .. | ||
| src | ||
| spring-messaging.gradle | ||