@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt | 3 --- 1 file changed, 3 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -1,9 +1,6 @@ -<<<<<<< HEAD [% USE Koha %] [% USE raw %] [% USE Asset %] -======= ->>>>>>> Bug 18308: Changed ordering of onboarding steps [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › Set minPasswordLength system preference [% INCLUDE 'installer-doc-head-close.inc' %] --