fix: Resolve merge conflicts

SAP · Sep 29, 2024 · 59ba95d · 59ba95d
1 parent ac5a04a
commit 59ba95d
Show file tree

Hide file tree

Showing 4 changed files with 337 additions and 76 deletions.
diff --git a/test/lib/linter/rules/snapshots/AsyncComponentFlags.ts.md b/test/lib/linter/rules/snapshots/AsyncComponentFlags.ts.md
@@ -167,6 +167,14 @@ Generated by [AVA](https://avajs.dev).
         ],
         warningCount: 0,
       },
+      {
+        coverageInfo: [],
+        errorCount: 0,
+        fatalErrorCount: 0,
+        filePath: 'ParentComponent.js',
+        messages: [],
+        warningCount: 0,
+      },
     ]
 
 ## General: Negative_06
@@ -295,6 +303,14 @@ Generated by [AVA](https://avajs.dev).
         ],
         warningCount: 0,
       },
+      {
+        coverageInfo: [],
+        errorCount: 0,
+        fatalErrorCount: 0,
+        filePath: 'ParentComponent.ts',
+        messages: [],
+        warningCount: 0,
+      },
     ]
 
 ## General: Negative_10
@@ -340,6 +356,14 @@ Generated by [AVA](https://avajs.dev).
         ],
         warningCount: 0,
       },
+      {
+        coverageInfo: [],
+        errorCount: 0,
+        fatalErrorCount: 0,
+        filePath: 'ParentComponent.ts',
+        messages: [],
+        warningCount: 0,
+      },
     ]
 
 ## General: Positive_01

diff --git a/test/lib/linter/rules/snapshots/AsyncComponentFlags.ts.snap b/test/lib/linter/rules/snapshots/AsyncComponentFlags.ts.snap