slapos_jio: fixup rebase

master/bt5/slapos_jio/bt/template_action_path_list

+Certificate Login | slaposjs_view
\ No newline at end of file

master/bt5/slapos_jio/bt/template_keep_last_workflow_history_only_path_list

+web_page_module/rjs_gadget_erp5_page_slap_certificate_login_view_html
+web_page_module/rjs_gadget_erp5_page_slap_certificate_login_view_js
 web_page_module/rjs_gadget_erp5_page_slap_test_parameter_form_html
 web_page_module/rjs_gadget_erp5_page_slap_test_parameter_form_js
 web_page_module/rjs_gadget_erp5_page_slap_test_readonly_parameter_form_html
 web_page_module/rjs_gadget_erp5_page_slap_test_readonly_parameter_form_js
+web_page_module/rjs_gadget_slapos_label_listbox_field_html
+web_page_module/rjs_gadget_slapos_label_listbox_field_js
+web_page_module/rjs_gadget_slapos_status_css
+web_page_module/rjs_gadget_slapos_status_html
+web_page_module/rjs_gadget_slapos_status_js
+web_page_module/rjs_leaflet_css
+web_page_module/rjs_leaflet_js
\ No newline at end of file

master/bt5/slapos_jio/bt/template_path_list

-<<<<<<< HEAD
+web_page_module/rjs_gadget_erp5_page_slap_certificate_login_view_html
+web_page_module/rjs_gadget_erp5_page_slap_certificate_login_view_js
 web_page_module/rjs_gadget_erp5_page_slap_test_parameter_form_html
 web_page_module/rjs_gadget_erp5_page_slap_test_parameter_form_js
 web_page_module/rjs_gadget_erp5_page_slap_test_readonly_parameter_form_html
 web_page_module/rjs_gadget_erp5_page_slap_test_readonly_parameter_form_js
+web_page_module/rjs_gadget_slapos_label_listbox_field_html
+web_page_module/rjs_gadget_slapos_label_listbox_field_js
+web_page_module/rjs_gadget_slapos_status_css
+web_page_module/rjs_gadget_slapos_status_html
+web_page_module/rjs_gadget_slapos_status_js
+web_page_module/rjs_leaflet_css
+web_page_module/rjs_leaflet_js
\ No newline at end of file