mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
fix build bustage due to merge conflict screwup
This commit is contained in:
parent
fc561bc57d
commit
556887f125
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user