From 881c80f57a3b31be7205d8d66950b8a8ac63c42a Mon Sep 17 00:00:00 2001 From: Andrew Fuerste-Henry Date: Mon, 8 Mar 2021 15:52:20 +0000 Subject: [PATCH] Bug 27754: Clear merge markers Signed-off-by: Andrew Fuerste-Henry --- koha-tmpl/intranet-tmpl/prog/js/basket.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/basket.js b/koha-tmpl/intranet-tmpl/prog/js/basket.js index 6387903193..080e8e4d5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/basket.js +++ b/koha-tmpl/intranet-tmpl/prog/js/basket.js @@ -410,16 +410,6 @@ function showLess() { } function updateBasket(updated_value,target) { -<<<<<<< HEAD - if(target){ - target.$('#basketcount').html(" ("+updated_value+")"); - target.$('#cartDetails').html(MSG_IN_YOUR_CART.format(updated_value)); - } else { - $('#basketcount').html(" ("+updated_value+")"); - $('#cartDetails').html(MSG_IN_YOUR_CART.format(updated_value)); - } - var basketcount = updated_value; -======= if(target){ target.$('#basketcount').html(" ("+updated_value+")"); target.$('#cartDetails').html(__("Items in your cart: %s").format(updated_value)); @@ -427,7 +417,6 @@ function updateBasket(updated_value,target) { $('#basketcount').html(" ("+updated_value+")"); $('#cartDetails').html(__("Items in your cart: %s").format(updated_value)); } ->>>>>>> 7666b52cec... Bug 27754: Correct eslint errors in basket.js } function openBiblio(openerURL) { @@ -437,17 +426,10 @@ function openBiblio(openerURL) { function addSelToShelf() { var items = document.getElementById('records').value; -<<<<<<< HEAD - if(items){ - document.location = "/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber="+items; - } else { - alert(MSG_NO_RECORD_SELECTED); -======= if(items){ document.location = "/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber="+items; } else { alert(__("No item was selected")); ->>>>>>> 7666b52cec... Bug 27754: Correct eslint errors in basket.js } } -- 2.39.5