ingadhoc/website#297

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-t-40504-mnp-eUNW-fw

head

9ec0f3cc0106242a1c3b1e17cb63ffe183cb0c16

target

17.0

merged

hace 1 mes by Bruno Zanotti

forward-port of

ingadhoc/website#292 DETACHED (conflicts: ('28da1f8c6eae6bf26409ee0d1e1555a664a71209', 'Auto-merging website_sale_search_improved/views/res_config_settings_views.xml\nCONFLICT (content): Merge conflict in website_sale_search_improved/views/res_config_settings_views.xml\nAuto-merging website_sale_search_improved/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_search_improved/__manifest__.py\n', "20:50:25.718538 git.c:444 trace: built-in: git cherry-pick 28da1f8c6eae6bf26409ee0d1e1555a664a71209\nerror: could not apply 28da1f8... [REF] website_sale_search_improved: change string\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['28da1f8c6eae6bf26409ee0d1e1555a664a71209', 'c02ebf85254e5860bd4ba957ee4910f47abe1f67']) ('28da1f8c6eae6bf26409ee0d1e1555a664a71209', 'Auto-merging website_sale_search_improved/views/res_config_settings_views.xml\nCONFLICT (content): Merge conflict in website_sale_search_improved/views/res_config_settings_views.xml\nAuto-merging website_sale_search_improved/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_search_improved/__manifest__.py\n', "20:50:25.718538 git.c:444 trace: built-in: git cherry-pick 28da1f8c6eae6bf26409ee0d1e1555a664a71209\nerror: could not apply 28da1f8... [REF] website_sale_search_improved: change string\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['28da1f8c6eae6bf26409ee0d1e1555a664a71209', 'c02ebf85254e5860bd4ba957ee4910f47abe1f67']))

[FW][REF] website_sale_search_improved: change string

Forward-Port-Of: ingadhoc/website#292