LP1899406 - Resolve conflicts in basket-actions.component.html user/mmorgan/lp1899406_conflicts_resolved
authorMichele Morgan <mmorgan@noblenet.org>
Fri, 14 May 2021 20:29:20 +0000 (20:29 +0000)
committerMichele Morgan <mmorgan@noblenet.org>
Fri, 14 May 2021 20:29:20 +0000 (20:29 +0000)
commit78be64e0701bcec04ba1306854eba92ab8c3bf2b
tree076a4096059978cd595d3de966c7a706d62bee28
parentdfea746219b49692db8698559ce83efa2c30027c
LP1899406 - Resolve conflicts in basket-actions.component.html

Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html