Commit 93392dd
committed
no special case for macOS running Karma locally
- also, reformat a conditional
ariya/phantomjs#14558 was causing seg faults at the time this
change was made; it is no longer causing seg faults, so phantomjs should be the default.
this was prompted by #27591 parent 4d1d91d commit 93392dd
2 files changed
+6
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
| |||
48 | 47 | | |
49 | 48 | | |
50 | 49 | | |
51 | | - | |
| 50 | + | |
52 | 51 | | |
53 | 52 | | |
54 | 53 | | |
| |||
97 | 96 | | |
98 | 97 | | |
99 | 98 | | |
100 | | - | |
101 | | - | |
102 | | - | |
| 99 | + | |
103 | 100 | | |
104 | | - | |
| 101 | + | |
| 102 | + | |
105 | 103 | | |
106 | 104 | | |
| 105 | + | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
334 | 334 | | |
335 | 335 | | |
336 | 336 | | |
337 | | - | |
338 | 337 | | |
339 | 338 | | |
340 | 339 | | |
| |||
0 commit comments