Skip to content

Commit 021bafa

Browse files
Fix merge conflict in test
1 parent 0cd2090 commit 021bafa

File tree

4 files changed

+8
-37
lines changed

4 files changed

+8
-37
lines changed

data/fixtures/recorded/hatTokenMap/takeEach.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
languageId: plaintext
22
command:
3-
<<<<<<<< HEAD:data/fixtures/recorded/hatTokenMap/takeEach.yml
4-
version: 1
5-
spokenForm: take each
6-
action: setSelection
7-
targets:
8-
- type: primitive
9-
mark: {type: decoratedSymbol, symbolColor: default, character: e}
10-
========
113
version: 5
124
spokenForm: take harp
135
action: {name: setSelection}
146
targets:
157
- type: primitive
16-
mark: {type: decoratedSymbol, symbolColor: default, character: h}
8+
mark: {type: decoratedSymbol, symbolColor: default, character: e}
179
usePrePhraseSnapshot: false
18-
>>>>>>>> main:data/fixtures/recorded/hatTokenMap/takeHarp.yml
1910
initialState:
2011
documentContents: hello world
2112
selections:

data/fixtures/recorded/hatTokenMap/takeHarp.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
languageId: plaintext
22
command:
3-
<<<<<<<< HEAD:data/fixtures/recorded/hatTokenMap/takeEach.yml
4-
version: 1
5-
spokenForm: take each
6-
action: setSelection
7-
targets:
8-
- type: primitive
9-
mark: {type: decoratedSymbol, symbolColor: default, character: e}
10-
========
113
version: 5
124
spokenForm: take harp
135
action: {name: setSelection}
146
targets:
157
- type: primitive
168
mark: {type: decoratedSymbol, symbolColor: default, character: h}
179
usePrePhraseSnapshot: false
18-
>>>>>>>> main:data/fixtures/recorded/hatTokenMap/takeHarp.yml
1910
initialState:
2011
documentContents: hello world
2112
selections:

data/fixtures/recorded/testCaseRecorder/takeEach.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
languageId: plaintext
22
command:
3-
<<<<<<<< HEAD:data/fixtures/recorded/testCaseRecorder/takeEach.yml
43
version: 6
54
spokenForm: take each
6-
========
7-
version: 7
8-
spokenForm: take harp
9-
>>>>>>>> main:data/fixtures/recorded/testCaseRecorder/takeHarp.yml
105
action:
116
name: setSelection
127
target:
Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
languageId: plaintext
22
command:
3-
<<<<<<<< HEAD:data/fixtures/recorded/testCaseRecorder/takeEach.yml
4-
version: 6
5-
spokenForm: take each
6-
========
7-
version: 7
3+
version: 5
84
spokenForm: take harp
9-
>>>>>>>> main:data/fixtures/recorded/testCaseRecorder/takeHarp.yml
10-
action:
11-
name: setSelection
12-
target:
13-
type: primitive
14-
mark: {type: decoratedSymbol, symbolColor: default, character: e}
5+
action: {name: setSelection}
6+
targets:
7+
- type: primitive
8+
mark: {type: decoratedSymbol, symbolColor: default, character: h}
159
usePrePhraseSnapshot: false
1610
initialState:
1711
documentContents: hello world
1812
selections:
1913
- anchor: {line: 0, character: 11}
2014
active: {line: 0, character: 11}
2115
marks:
22-
default.e:
16+
default.h:
2317
start: {line: 0, character: 0}
2418
end: {line: 0, character: 5}
2519
finalState:
2620
documentContents: hello world
2721
selections:
2822
- anchor: {line: 0, character: 0}
29-
active: {line: 0, character: 5}
23+
active: {line: 0, character: 5}

0 commit comments

Comments
 (0)