Skip to content

Commit 86f13b9

Browse files
Minor Changes
1 parent dbb5108 commit 86f13b9

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

test/integration/rules/autocomplete-valid/autocomplete-valid.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,13 @@
11
{
22
"description": "autocomplete-valid tests",
33
"rule": "autocomplete-valid",
4-
<<<<<<< HEAD
5-
"violations": [
6-
["#fail1"],
7-
["#fail2"],
8-
["#fail3"],
9-
["#fail4"],
10-
["#fail5"],
11-
["#fail6"],
12-
["#fail7"],
13-
["#fail8"],
14-
["#fail9"],
15-
["#fail10"],
16-
["#fail11"]
17-
=======
184
"violations": [["#fail1"], ["#fail2"], ["#fail3"], ["#fail4"], ["#fail5"]],
195
"incomplete": [
206
["#incomplete1"],
217
["#incomplete2"],
228
["#incomplete3"],
239
["#incomplete4"],
2410
["#incomplete5"]
25-
>>>>>>> e997880ebbfefc634caf535727afe2d5efd212f3
2611
],
2712
"passes": [
2813
["#pass1"],

0 commit comments

Comments
 (0)