fix: Merge conflicts

SAP · Apr 12, 2024 · c67407f · c67407f
1 parent f3ed083
commit c67407f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/test/lib/linter/snapshots/linter.ts.md b/test/lib/linter/snapshots/linter.ts.md
@@ -756,19 +756,7 @@ Generated by [AVA](https://avajs.dev).
     [
       {
         coverageInfo: [],
-<<<<<<< HEAD
-        errorCount: 1,
-=======
-        errorCount: 0,
-        fatalErrorCount: 0,
-        filePath: 'webapp/Component.js',
-        messages: [],
-        warningCount: 0,
-      },
-      {
-        coverageInfo: [],
         errorCount: 2,
->>>>>>> 97ea3f8 (feat: Add tests)
         fatalErrorCount: 0,
         filePath: 'webapp/controller/App.controller.js',
         messages: [

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