From 78be64e0701bcec04ba1306854eba92ab8c3bf2b Mon Sep 17 00:00:00 2001 From: Michele Morgan Date: Fri, 14 May 2021 20:29:20 +0000 Subject: [PATCH] LP1899406 - Resolve conflicts in basket-actions.component.html Signed-off-by: Michele Morgan --- .../src/eg2/src/app/staff/catalog/basket-actions.component.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html index f70c1c5b07..d9764a1d10 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html @@ -30,15 +30,10 @@ - - - - -- 2.11.0