From 9e7bddef9fa95a1fbe3a84dc556e0aceec5f0cae Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 1 Feb 2012 16:54:22 -0500 Subject: [PATCH] Revert "Receipt editor and %bill_id%" This reverts commit 22a8120544d954eadc8750c3cbbf7085deb4982b. --- Open-ILS/xul/staff_client/chrome/content/util/print.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js index 091322f568..6ea3a54848 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/print.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js @@ -96,13 +96,8 @@ util.print.prototype = { }, 'escape_html' : function(data) { -<<<<<<< HEAD if (typeof data == 'null') { return ''; } return data.replace(/&/g,'&').replace(//g,'>'); -======= - if (typeof data == 'object') { return ''; } - return String(data).replace(/&/g,'&').replace(//g,'>'); ->>>>>>> 0d795bf... Receipt editor and %bill_id% }, 'simple' : function(msg,params) { -- 2.11.0