slapos_jio: fixup rebase

9761d114 · Romain Courteaud · b4dcf1ba · 9761d114
Commit 9761d114 authored Aug 09, 2023 by Romain Courteaud
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

master/bt5/slapos_jio/bt/template_keep_last_workflow_history_only_path_list ...jio/bt/template_keep_last_workflow_history_only_path_list +0 -3

No files found.
--- a/master/bt5/slapos_jio/bt/template_keep_last_workflow_history_only_path_list
+++ b/master/bt5/slapos_jio/bt/template_keep_last_workflow_history_only_path_list
-<<<<<<< HEAD
-=======
->>>>>>> slapos_jio: drop Computer Network scripts
 image_module/gadget_slapos_invoice_logo_png
 image_module/gadget_slapos_panel_png
 web_page_module/gadget_erp5_page_slap_cloud_contract_view_html