From 0759dc2c4329fd910f69af425f08af18861c3c8b Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Sat, 3 Nov 2001 07:11:29 +0000 Subject: [PATCH] remove bogus line (from a CVS conflict) that was causing compose to not work. also, fix a js strict warning. rs=bienvenu git-svn-id: svn://10.0.0.236/trunk@107235 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/compose/resources/content/MsgComposeCommands.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js index f26a47b0aca..6e41d9478b2 100644 --- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js +++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js @@ -1279,7 +1279,7 @@ function ComposeStartup(recycled, aParams) var attachments = msgCompFields.attachmentsArray; if (attachments) - for (var i = 0; i < attachments.Count(); i ++) + for (i = 0; i < attachments.Count(); i ++) AddAttachment(attachments.QueryElementAt(i, Components.interfaces.nsIMsgAttachment)); } @@ -1853,7 +1853,6 @@ function SuppressComposeCommandUpdating(suppress) CommandUpdate_MsgCompose(); } ->>>>>>> 1.227 function AdjustFocus() { //dump("XXX adjusting focus\n");