# Conflicts: # spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java # spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java |
||
|---|---|---|
| .. | ||
| src | ||
| spring-websocket.gradle | ||