Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build bustage due to merge conflict screwup

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@97754 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%netscape.com 2001-06-22 05:08:34 +00:00
parent be1401e98c
commit 29e5cfb8af
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/chrome/src/nsChromeRegistry.cpp
View File

@ -2811,8 +2811,6 @@ nsresult nsChromeRegistry::LoadStyleSheet(nsICSSStyleSheet** aSheet, const nsCSt
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), aURL);
if (NS_FAILED(rv)) return rv;
rv = url->SetSpec(aURL);
if (NS_FAILED(rv)) return rv;
rv = LoadStyleSheetWithURL(uri, aSheet);
return rv;

2
mozilla/rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -2811,8 +2811,6 @@ nsresult nsChromeRegistry::LoadStyleSheet(nsICSSStyleSheet** aSheet, const nsCSt
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), aURL);
if (NS_FAILED(rv)) return rv;
rv = url->SetSpec(aURL);
if (NS_FAILED(rv)) return rv;
rv = LoadStyleSheetWithURL(uri, aSheet);
return rv;