Merge branch '3.1.x'

2022-11-02 20:23:08 -04:00
parent 8493efb845 23fc153ab3
commit e25dd08dbf
1 changed files with 1 additions and 1 deletions
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java
@@ -294,7 +294,7 @@ public class ResourceControllerTests {
 	}

 	private String replaceNewLines(String text) {
-		return text.replace("\n", "").replace("\t", "");
+		return text.replace("\r", "").replace("\n", "").replace("\t", "");
 	}

 	@Test