fix: Merge conflicts

SAP · Nov 12, 2024 · 3651db5 · 3651db5
1 parent 07e5437
commit 3651db5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/linter/ui5Types/SourceFileLinter.ts b/src/linter/ui5Types/SourceFileLinter.ts
@@ -67,9 +67,8 @@ export default class SourceFileLinter {
 		private checker: ts.TypeChecker,
 		private reportCoverage = false,
 		private messageDetails = false,
-		private dataTypes: Record<string, string> = {},
-		private manifestContent?: string,
-		private apiExtract: ApiExtract
+		private apiExtract: ApiExtract,
+		private manifestContent?: string
 	) {
 		this.#reporter = new SourceFileReporter(context, resourcePath,
 			sourceFile, sourceMaps?.get(sourceFile.fileName));
@@ -1249,7 +1248,7 @@ export default class SourceFileLinter {
 						if (!ts.isExportAssignment(declaration)) {
 							return;
 						}
-						const type = this.#checker.getTypeAtLocation(declaration.expression);
+						const type = this.checker.getTypeAtLocation(declaration.expression);
 						if (type.symbol?.flags & ts.SymbolFlags.Enum) {
 							isEnum = true;
 						}