Skip to content

Commit

Permalink
fix: Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
d3xter666 committed Dec 17, 2024
1 parent 60d4064 commit e2d7611
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Generated by [AVA](https://avajs.dev).
column: 3,
line: 23,
message: 'Abandoned bootstrap parameter \'data-sap-ui-no-duplicate-ids\' should be removed',
messageDetails: 'Duplicate id checks are enforced with UI5 2.X',
messageDetails: 'Duplicate ID checks are enforced with UI5 2.x',
ruleId: 'no-deprecated-api',
severity: 2,
},
Expand Down
Binary file modified test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.snap
Binary file not shown.

0 comments on commit e2d7611

Please sign in to comment.