Jonathan Druart
49ab11b61d
Fix bad conflict resolution with bug 29648. Test plan: Confirm that the "Columns" button is displayed on the patron result view and that it works as expected. Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> |
||
|---|---|---|
| .. | ||
| css | ||
| en | ||
| img | ||
| js | ||
| sound | ||