Merge branch 'main' of https://gitea.grupoginseng.com.br/andrey.cunha/fluig
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<java version="1.8.0_481" class="java.beans.XMLDecoder">
|
||||
<java version="1.8.0_202" class="java.beans.XMLDecoder">
|
||||
<object class="java.util.HashMap">
|
||||
<void method="put">
|
||||
<<<<<<< HEAD
|
||||
<string>volume</string>
|
||||
<array class="java.lang.String" length="1">
|
||||
<void index="0">
|
||||
@@ -219,6 +220,8 @@
|
||||
</array>
|
||||
</void>
|
||||
<void method="put">
|
||||
=======
|
||||
>>>>>>> fee598ec0b92c4a7af8f53a212462510f2668f6f
|
||||
<string>mecanismoGrupo</string>
|
||||
<object class="java.util.ArrayList">
|
||||
<void method="add">
|
||||
@@ -855,6 +858,7 @@
|
||||
</void>
|
||||
</array>
|
||||
</void>
|
||||
<<<<<<< HEAD
|
||||
<void method="put">
|
||||
<string>camposFormulario, documentoId = 9305</string>
|
||||
<array class="java.lang.String" length="51">
|
||||
@@ -1564,5 +1568,7 @@
|
||||
</void>
|
||||
</object>
|
||||
</void>
|
||||
=======
|
||||
>>>>>>> fee598ec0b92c4a7af8f53a212462510f2668f6f
|
||||
</object>
|
||||
</java>
|
||||
|
||||
Reference in New Issue
Block a user