From 568b305cacaae8a01f8ee9dd280013237f34d047 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Fri, 2 Dec 2005 14:49:27 +0000
Subject: [PATCH] Merge-conflict update between bugs 317937 and 313309

---
 mailnews/compose/src/nsMsgCopy.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mailnews/compose/src/nsMsgCopy.h b/mailnews/compose/src/nsMsgCopy.h
index d2ee444d4ead..2924bc3c99fc 100644
--- a/mailnews/compose/src/nsMsgCopy.h
+++ b/mailnews/compose/src/nsMsgCopy.h
@@ -135,8 +135,6 @@ public:
   char                            *mSavePref;
 };
 
-NS_DEFINE_STATIC_IID_ACCESSOR(nsMsgCopy, NS_IMSGCOPY_IID)
-
 // Useful function for the back end...
 nsresult	LocateMessageFolder(nsIMsgIdentity   *userIdentity, 
                                        nsMsgDeliverMode aFolderType,