Merge branch 'main' of https://gitea.grupoginseng.com.br/andrey.cunha/fluig
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<<<<<<< HEAD
|
||||
<java version="1.8.0_481" class="java.beans.XMLDecoder">
|
||||
=======
|
||||
<java version="1.8.0_202" class="java.beans.XMLDecoder">
|
||||
>>>>>>> fee598ec0b92c4a7af8f53a212462510f2668f6f
|
||||
<object class="java.util.HashMap">
|
||||
<void method="put">
|
||||
<string>volume</string>
|
||||
|
||||
Reference in New Issue
Block a user