Skip to content

Fix bad Merge on differenceChart.js. from: e6e89b3dc2b26b8b787f6954… #2157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmchaplin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bad Merge on differenceChart.js. from: e6e89b3dc2b26b8b787f6954… #2157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions test/mocha/differenceChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,35 +217,6 @@
describe('Processing Data', function () {
it('should does not process data if series toggled off', function () {
builder.model.showPredictedLine(false);
<<<<<<< HEAD
var expectedData = [{
key: 'Predicted Data minus Actual Data (Predicted > Actual)',
type: 'area',
values: [{ x: 123, y0: 10, y1: 15 }, { x: 124, y0: 20, y1: 25 }],
yAxis: 1,
color: 'rgba(44,160,44,.9)',
processed: true,
noHighlightSeries: true
},
{
key: 'Predicted Data minus Actual Data (Predicted < Actual)',
type: 'area',
values: [{ x: 123, y0: 10, y1: 10 }, { x: 124, y0: 20, y1: 20 }],
yAxis: 1,
color: 'rgba(234,39,40,.9)',
processed: true,
noHighlightSeries: true
},
{
key: 'Actual Data',
type: 'line',
values: [{ x: 123, y: 10 }, { x: 124, y: 20 }],
yAxis: 1,
color: '#666666',
processed: true,
strokeWidth: 1
}];
=======
var expectedData = [
{
key: 'Predicted Data minus Actual Data (Predicted > Actual)',
Expand Down