From: Michele Morgan Date: Fri, 14 May 2021 20:29:20 +0000 (+0000) Subject: LP1899406 - Resolve conflicts in basket-actions.component.html X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fmmorgan%2Flp1899406_conflicts_resolved;p=working%2FEvergreen.git LP1899406 - Resolve conflicts in basket-actions.component.html Signed-off-by: Michele Morgan --- 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 @@ - - - -