fix merge

facebook · Feb 28, 2022 · 88c892c · 88c892c
1 parent 5fa8097
commit 88c892c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/index.html b/index.html
@@ -2652,17 +2652,10 @@ <h2>Syntax</h2>
         <emu-t>}</emu-t>
     </emu-rhs>
 </emu-production>
-<<<<<<< HEAD
-<emu-production name="JSXText" id="prod-JSXText">
-    <emu-nt><a href="#prod-JSXText">JSXText</a></emu-nt> <emu-geq>:</emu-geq> <emu-rhs a="z5eumfmp">
+<emu-production name="JSXText" type="lexical" id="prod-JSXText">
+    <emu-nt><a href="#prod-JSXText">JSXText</a></emu-nt> <emu-geq>::</emu-geq> <emu-rhs a="z5eumfmp">
         <emu-nt id="_ref_47"><a href="#prod-JSXTextCharacter">JSXTextCharacter</a></emu-nt>
         <emu-nt optional="" id="_ref_48"><a href="#prod-JSXText">JSXText</a><emu-mods><emu-opt>opt</emu-opt></emu-mods></emu-nt>
-=======
-<emu-production name="JSXText" type="lexical">
-    <emu-nt>JSXText</emu-nt> <emu-geq>::</emu-geq> <emu-rhs a="z5eumfmp">
-        <emu-nt>JSXTextCharacter</emu-nt>
-        <emu-nt optional="">JSXText<emu-mods><emu-opt>opt</emu-opt></emu-mods></emu-nt>
->>>>>>> b63b820 (fix typo)
     </emu-rhs>
 </emu-production>
 <emu-production name="JSXTextCharacter" type="lexical" id="prod-JSXTextCharacter">

diff --git a/spec.emu b/spec.emu
@@ -163,13 +163,8 @@ render(dropdown);
         JSXFragment
         `{` JSXChildExpression? `}`
 
-<<<<<<< HEAD
-      JSXText :
+      JSXText ::
         JSXTextCharacter JSXText?
-=======
-JSXText ::
-  JSXTextCharacter JSXText?
->>>>>>> b63b820 (fix typo)
 
       JSXTextCharacter ::
         JSXStringCharacter but not one of `{` or `<` or `>` or `}`