Merge branch 'master' into testcontainers-conf

Signed-off-by: salaboy <[email protected]>

Author: salaboy

dapr-spring/dapr-spring-messaging/src/main/java/io/dapr/spring/messaging/DaprMessagingTemplate.java

@@ -31,18 +31,10 @@
 import org.springframework.lang.Nullable;
 import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
-<<<<<<< HEAD
-<<<<<<< HEAD
+
 import reactor.util.context.Context;
 import java.util.Collections;
 import java.util.HashMap;
-=======
-=======
-
-import java.util.Map;
->>>>>>> 7490434d (Remove all global state from setProperty (#1138))
-
->>>>>>> 7490434d (Remove all global state from setProperty (#1138))
 import java.util.Map;
 
 /**