chart2/qa/extras/chart2export.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 05b55fd2a170209c21175f9fa727169f3998052e
Author: Markus Mohrhard <[email protected]>
Date: Sun Mar 30 17:13:04 2014 +0200
remove one more merge marker
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 8e0a4f9..ead4350 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");
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
