From 7cfe5e669875e06410957ad0fe7a940a5119e764 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Wed, 17 Apr 2019 07:03:31 +0000 Subject: [PATCH] Bug 18308: (QA follow up) Resolving merge conflict Signed-off-by: Liz Rea --- koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt | 3 --- 1 file changed, 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt index 6d22d8a937..a1ae8ac3b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/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' %] -- 2.11.0