Bug 1517467 fix nsGenericHTMLFrameElement.cpp CLOSED TREE

2019-01-04 01:20:26 +02:00
parent 29705797fe
commit 203afe7663
1 changed files with 0 additions and 1 deletions
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -76,7 +76,6 @@ Document* nsGenericHTMLFrameElement::GetContentDocument(
    return nullptr;
  }

-<<<<<<< working copy
  nsPIDOMWindowOuter* window = bc->GetDOMWindow();
  if (!window) {
    // Either our browsing context contents are out-of-process (in which case