fixup

whatwg · Jul 31, 2017 · 11a5b40 · 11a5b40
1 parent 84ebacf
commit 11a5b40
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/source b/source
@@ -113483,7 +113483,6 @@ if (s = prompt('What is your name?')) {
 
   <h3>Requirements for implementations</h3>
 
-<<<<<<< HEAD
   <h4 data-dfn-type="element" data-lt="applet">The <dfn><code>applet</code></dfn> element</h4>
 
   <p class="critical">This feature is in the process of being removed from the Web platform. (This