From 847e3caffad4435c2ac83bdaf8ab2dd4cf444b46 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Mon, 9 Aug 2004 23:15:24 +0000 Subject: [PATCH] Merging changes between MOZILLA_1_7_RELEASE and AVIARY_20040809_MERGEPOINT, a=ben: bad merging for bug 253597 git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@160568 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/cookie/nsImgManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla/extensions/cookie/nsImgManager.cpp b/mozilla/extensions/cookie/nsImgManager.cpp index fd5e1399aac..eed63f50889 100644 --- a/mozilla/extensions/cookie/nsImgManager.cpp +++ b/mozilla/extensions/cookie/nsImgManager.cpp @@ -263,7 +263,7 @@ nsImgManager::TestPermission(nsIURI *aCurrentURI, // Third party checking if (mBehaviorPref == IMAGE_NOFOREIGN) { - // We need a requesting uri for third party checks to work + // We need a requesting uri for third party checks to work. if (!aFirstURI) return NS_OK;