From d4ed883f3249f531deccc436fe0fbf59249442b8 Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Tue, 16 Feb 2021 21:00:20 +1100
Subject: [PATCH] Fix up merge issues

---
 source | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source b/source
index eeb283907de..cbeb6293fb9 100644
--- a/source
+++ b/source
@@ -1,4 +1,4 @@
-<!-- -*- mode: Text; fill-column: 100 -*- vim: set textwidth=100 :	
+<!-- -*- mode: Text; fill-column: 100 -*- vim: set textwidth=100 :
  !   EDITOR NOTES
  !
  !   Adding a new element involves editing the following sections:
@@ -3709,7 +3709,7 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
     <p>The following terms are defined in the <cite>CSS Scoping</cite>: <ref spec=CSSSCOPING></p>
 
     <ul class="brief">
-     <li><dfn id="flat-tree" data-x-href="https://drafts.csswg.org/css-scoping/#flat-tree">flat tree</dfn></li>
+     <li><dfn data-x-href="https://drafts.csswg.org/css-scoping/#flat-tree">flat tree</dfn></li>
     </ul>
 
     <p>The following terms and features are defined in <cite>CSS Color Adjustment</cite>: <ref