Revert "Receipt editor and %bill_id%"

This reverts commit 22a8120544d954eadc8750c3cbbf7085deb4982b.

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 091322f..6ea3a54 100644 (file)
--- 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,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-=======
-        if (typeof data == 'object') { return ''; }
-        return String(data).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
->>>>>>> 0d795bf... Receipt editor and %bill_id%
     },
 
     'simple' : function(msg,params) {