[erp5_web_renderjs_ui] Wrong manual git rebase

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css

@@ -680,64 +680,9 @@ div[data-gadget-scope='header'] .ui-header h1 > span {
     padding-left: 2em;
   }
 }
-<<<<<<< HEAD
-.ui-listview li span.ui-li-icon-custom:after {
-  background: none repeat scroll 0 center transparent;
-}
-
-/* color even odd */
-html .ui-listview li:nth-child(even),
-html .ui-listview li:nth-child(even) > .ui-btn {
-  background-color: #fff;
-  background-color: rgba(0,0,0,0);
-}
-
-/* fix relation string field background transparent error */
-html .ui-listview li.ui-autocomplete ~ li {
-  background-color: white;
-}
-
-/*
-   -------------------------------------------------------------------------
-   ----------------------------- Controlgroup ------------------------------
-   -------------------------------------------------------------------------
-*/
-
-/* fix button font-size */
-html body .ui-header .ui-controlgroup .ui-btn-icon-notext,
-html body .ui-footer .ui-controlgroup .ui-btn-icon-notext {
-  font-size: 100%;
-}
-/* search tag list needs to inline controlgroups */
-.ui-tag-list .ui-controlgroup {
-  display: inline-block;
-  vertical-align: top;
-}
-/* need to overwrite */
-html.ui-mobile head + body .ui-field-contain .ui-input-text .ui-tag-list > .ui-controlgroup {
-  width: auto;
-}
-/* set padding if text and notext controlgroups are combined */
-html body .ui-controlgroup-horizontal .ui-btn ~ .ui-btn-icon-notext {
-  padding-left: .2em;
-  padding-right: .2em;
-}
-/* set all paddings */
-html body .ui-tag-list .ui-controlgroup-horizontal .ui-btn {
-  font-size: .85em;
-  padding-top: .4em;
-  padding-bottom: .4em;
-}
-/*inset tag list */
-html body .ui-tag-list-inset {
-  position: absolute;
-  top: 0;
-  right: 0;
-=======
 div[data-gadget-scope='header'] .ui-header h1 a {
   display: block;
   color: #FFFFFF;
->>>>>>> [erp5_web_renderjs_ui] Drop unused files
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml

@@ -230,7 +230,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>952.14468.56596.29457</string> </value>
+                <value> <string>952.21277.40593.7202</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -248,7 +248,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1467298883.69</float>
+                        <float>1467621439.3</float>
                         <string>UTC</string>
                       </tuple>
                     </state>