Commit afeb3bec authored by Richard's avatar Richard

resolve merge problems

parent 49852b72
...@@ -396,11 +396,7 @@ NETWORK:\n ...@@ -396,11 +396,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<<<<<<< HEAD
<value> <string>969.50674.1572.7867</string> </value> <value> <string>969.50674.1572.7867</string> </value>
=======
<value> <string>969.27899.61405.31965</string> </value>
>>>>>>> fd1027b... [erp5_officejs]: add python libraries to notebook appcache
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -418,19 +414,7 @@ NETWORK:\n ...@@ -418,19 +414,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<<<<<<< HEAD
<float>1535021998.08</float>
=======
<<<<<<< HEAD
<float>1525268788.94</float>
=======
<<<<<<< HEAD
<float>1534492524.35</float>
=======
<float>1533713860.15</float> <float>1533713860.15</float>
>>>>>>> [erp5_officejs]: add python libraries to notebook appcache
>>>>>>> 9f0892d... [erp5_officejs]: add python libraries to notebook appcache
>>>>>>> fd1027b... [erp5_officejs]: add python libraries to notebook appcache
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment