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
This commit is contained in:
sspitzer%netscape.com
2001-11-03 07:11:29 +00:00
parent f908dd5b01
commit 0759dc2c43

View File

@@ -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");