diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-30 17:13:04 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-30 17:13:04 +0200 |
| commit | 05b55fd2a170209c21175f9fa727169f3998052e (patch) | |
| tree | babbeb3238f184161165fc28993c10e8669f86d3 /chart2/qa | |
| parent | 6162ce7feb89d2f973ce1077b76ca691f00df1ac (diff) | |
remove one more merge marker
Diffstat (limited to 'chart2/qa')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 8e0a4f944c5b..ead4350c9110 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -556,7 +556,6 @@ void Chart2ExportTest::testUpDownBars() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars"); } -<<<<<<< HEAD void Chart2ExportTest::testDoughnutChart() { load("/chart2/qa/extras/data/docx/", "doughnutChart.docx"); |