update snapshots

Author: Dunqing

tasks/prettier_conformance/snapshots/prettier.js.snap.md

@@ -50,15 +50,6 @@ js compatibility: 704/754 (93.37%)
 | js/test-declarations/angularjs_inject.js | 💥💥 | 91.53% |
 | js/test-declarations/test_declarations.js | 💥💥 | 95.88% |
 | jsx/fbt/test.js | 💥 | 84.06% |
-<<<<<<< HEAD
-| jsx/fragment/fragment.js | 💥 | 98.61% |
-<<<<<<< HEAD
-| jsx/ignore/jsx_ignore.js | 💥 | 84.21% |
-=======
-| jsx/ignore/jsx_ignore.js | 💥 | 92.73% |
->>>>>>> 6b47b9c709 (Figure out all of `AstNodes::Argument` usage)
-=======
->>>>>>> cde8420097 (Correct wrapping parenthesis for CallExpression and NewExpression)
 | jsx/ignore/spread.js | 💥 | 83.33% |
 | jsx/jsx/quotes.js | 💥💥💥💥 | 79.41% |
 | jsx/single-attribute-per-line/single-attribute-per-line.js | 💥✨ | 43.37% |

tasks/prettier_conformance/snapshots/prettier.ts.snap.md

@@ -5,15 +5,6 @@ ts compatibility: 545/603 (90.38%)
 | Spec path | Failed or Passed | Match ratio |
 | :-------- | :--------------: | :---------: |
 | jsx/fbt/test.js | 💥 | 84.06% |
-<<<<<<< HEAD
-| jsx/fragment/fragment.js | 💥 | 98.61% |
-<<<<<<< HEAD
-| jsx/ignore/jsx_ignore.js | 💥 | 84.21% |
-=======
-| jsx/ignore/jsx_ignore.js | 💥 | 92.73% |
->>>>>>> 6b47b9c709 (Figure out all of `AstNodes::Argument` usage)
-=======
->>>>>>> cde8420097 (Correct wrapping parenthesis for CallExpression and NewExpression)
 | jsx/ignore/spread.js | 💥 | 83.33% |
 | jsx/jsx/quotes.js | 💥💥💥💥 | 79.41% |
 | jsx/single-attribute-per-line/single-attribute-per-line.js | 💥✨ | 43.37% |