fix: Merge conflicts

SAP · Apr 18, 2024 · ea65aa3 · ea65aa3
1 parent b5ca690
commit ea65aa3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/src/linter/ui5Types/SourceFileLinter.ts b/src/linter/ui5Types/SourceFileLinter.ts
@@ -23,7 +23,6 @@ export default class SourceFileLinter {
 	#boundVisitNode: (node: ts.Node) => void;
 	#reportCoverage: boolean;
 	#messageDetails: boolean;
-	#context: LinterContext;
 	#manifestContent: string | undefined;
 
 	constructor(

diff --git a/test/lib/linter/snapshots/linter.ts.md b/test/lib/linter/snapshots/linter.ts.md
@@ -792,9 +792,6 @@ Generated by [AVA](https://avajs.dev).
     [
       {
         coverageInfo: [],
-<<<<<<< HEAD
-        errorCount: 2,
-=======
         errorCount: 0,
         fatalErrorCount: 0,
         filePath: 'webapp/Component.js',
@@ -822,8 +819,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 1,
->>>>>>> f14afdd (fix: Tests)
+        errorCount: 2,
         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