Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
johnkerl committed Jan 30, 2022
1 parent 971255f commit 1a8d7ed
Showing 1 changed file with 50 additions and 50 deletions.
100 changes: 50 additions & 50 deletions test/cases/output-colorization/0002/expout
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
[
{
"a": "pan",
"b": "pan",
"i": 1,
"x": 0.3467901443380824,
"y": 0.7268028627434533
"a": "pan",
"b": "pan",
"i": 1,
"x": 0.3467901443380824,
"y": 0.7268028627434533
},
{
"a": "eks",
"b": "pan",
"i": 2,
"x": 0.7586799647899636,
"y": 0.5221511083334797
"a": "eks",
"b": "pan",
"i": 2,
"x": 0.7586799647899636,
"y": 0.5221511083334797
},
{
"a": "wye",
"b": "wye",
"i": 3,
"x": 0.20460330576630303,
"y": 0.33831852551664776
"a": "wye",
"b": "wye",
"i": 3,
"x": 0.20460330576630303,
"y": 0.33831852551664776
},
{
"a": "eks",
"b": "wye",
"i": 4,
"x": 0.38139939387114097,
"y": 0.13418874328430463
"a": "eks",
"b": "wye",
"i": 4,
"x": 0.38139939387114097,
"y": 0.13418874328430463
},
{
"a": "wye",
"b": "pan",
"i": 5,
"x": 0.5732889198020006,
"y": 0.8636244699032729
"a": "wye",
"b": "pan",
"i": 5,
"x": 0.5732889198020006,
"y": 0.8636244699032729
},
{
"a": "zee",
"b": "pan",
"i": 6,
"x": 0.5271261600918548,
"y": 0.49322128674835697
"a": "zee",
"b": "pan",
"i": 6,
"x": 0.5271261600918548,
"y": 0.49322128674835697
},
{
"a": "eks",
"b": "zee",
"i": 7,
"x": 0.6117840605678454,
"y": 0.1878849191181694
"a": "eks",
"b": "zee",
"i": 7,
"x": 0.6117840605678454,
"y": 0.1878849191181694
},
{
"a": "zee",
"b": "wye",
"i": 8,
"x": 0.5985540091064224,
"y": 0.976181385699006
"a": "zee",
"b": "wye",
"i": 8,
"x": 0.5985540091064224,
"y": 0.976181385699006
},
{
"a": "hat",
"b": "wye",
"i": 9,
"x": 0.03144187646093577,
"y": 0.7495507603507059
"a": "hat",
"b": "wye",
"i": 9,
"x": 0.03144187646093577,
"y": 0.7495507603507059
},
{
"a": "pan",
"b": "wye",
"i": 10,
"x": 0.5026260055412137,
"y": 0.9526183602969864
"a": "pan",
"b": "wye",
"i": 10,
"x": 0.5026260055412137,
"y": 0.9526183602969864
}
]

0 comments on commit 1a8d7ed

Please sign in to comment.