iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflict

This commit is contained in:
Anshul BANSAL 2020-01-03 14:06:34 +02:00
parent 876a34748d d8e31976f7
commit 0b979db129
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java-async/pom.xml
View File

@ -46,7 +46,6 @@
<artifactId>ea-async</artifactId> <artifactId>ea-async</artifactId>
<version>1.2.3</version> <version>1.2.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

4
pom.xml
View File

@ -507,8 +507,8 @@
<module>jackson-conversions</module> <module>jackson-conversions</module>
<module>jackson-conversions-2</module> <module>jackson-conversions-2</module>
<module>jackson-custom-conversions</module> <module>jackson-custom-conversions</module>
<module>java-async</module>
<module>jackson-modules</module> <module>jackson-modules</module>
<module>java-async</module>
<module>java-collections-conversions</module> <module>java-collections-conversions</module>
<module>java-collections-conversions-2</module> <module>java-collections-conversions-2</module>
<module>java-collections-maps</module> <module>java-collections-maps</module>
@ -1150,8 +1150,8 @@
<module>jackson-conversions</module> <module>jackson-conversions</module>
<module>jackson-conversions-2</module> <module>jackson-conversions-2</module>
<module>jackson-custom-conversions</module> <module>jackson-custom-conversions</module>
<module>java-async</module>
<module>jackson-modules</module> <module>jackson-modules</module>
<module>java-async</module>
<module>java-collections-conversions</module> <module>java-collections-conversions</module>
<module>java-collections-conversions-2</module> <module>java-collections-conversions-2</module>
<module>java-collections-maps</module> <module>java-collections-maps</module>