Merge branch 'master' into sreactor

Author: sinwe

README.md

@@ -34,10 +34,17 @@ With Gradle:
     }
 
     dependencies {
+<<<<<<< HEAD
         //compile "io.projectreactor:reactor-scala-extensions_2.12:0.4.0-SNAPSHOT
         //compile "io.projectreactor:reactor-scala-extensions_2.13.0-M3:0.3.5 //for scala 2.13.0-M3
         compile "io.projectreactor:reactor-scala-extensions_2.12:0.3.5 //for scala 2.12
         //compile "io.projectreactor:reactor-scala-extensions_2.11:0.3.5 //for scala 2.11
+=======
+        //compile "io.projectreactor:reactor-scala-extensions_2.12:0.4.1-SNAPSHOT
+        //compile "io.projectreactor:reactor-scala-extensions_2.13.0-M3:0.4.0 //for scala 2.13.0-M3
+        compile "io.projectreactor:reactor-scala-extensions_2.12:0.4.0 //for scala 2.12
+        //compile "io.projectreactor:reactor-scala-extensions_2.11:0.4.0 //for scala 2.11
+>>>>>>> master
     }
 
 With Maven:
@@ -58,15 +65,19 @@ With Maven:
     <dependency>
         <groupId>io.projectreactor</groupId>
         <artifactId>reactor-scala-extensions</artifactId>
+<<<<<<< HEAD
         <version>0.4.0-SNAPSHOT</version>
+=======
+        <version>0.4.1-SNAPSHOT</version>
+>>>>>>> master
     </dependency>
     -->
     <dependency>
         <groupId>io.projectreactor</groupId>
         <artifactId>reactor-scala-extensions_2.12</artifactId> <!-- for scala 2.12 -->
         <!--<artifactId>reactor-scala-extensions_2.11</artifactId> for scala 2.11 -->
         <!--<artifactId>reactor-scala-extensions_2.13.0-M3</artifactId> for scala 2.13.0-M3 -->
-        <version>0.3.5</version>
+        <version>0.4.0</version>
     </dependency>
 
 ## Contributing