[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - chart2/qa

[Gabor Kelemen (via logerrit)]

 chart2/qa/extras/chart2export.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit b2ebd057b7ea75cd109bef47710022a633ecc9a1
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Mon Mar 1 15:37:15 2021 +0100
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Mon Mar 1 15:40:20 2021 +0100

    Fix unit test breakage from commit 0c0b538
    
    Change-Id: I62e92340aed8c406dd0fa19402eda3f565177a27
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111753
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 4d8903bfaff4..41cb4b3fdbe5 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -177,12 +177,7 @@ public:
     void testTdf134255();
     void testTdf134977();
     void testTdf137917();
-<<<<<<< HEAD   (800bdf tdf#135198 tdf#138050 sw editing: fix text box position sync)
-=======
-    void testTdf138204();
-    void testTdf138181();
     void testCustomShapeText();
->>>>>>> CHANGE (1aacd8 tdf#138307 Chart import: fix lost custom shape text)
 
     CPPUNIT_TEST_SUITE(Chart2ExportTest);
     CPPUNIT_TEST(testErrorBarXLSX);
@@ -323,12 +318,7 @@ public:
     CPPUNIT_TEST(testTdf134255);
     CPPUNIT_TEST(testTdf134977);
     CPPUNIT_TEST(testTdf137917);
-<<<<<<< HEAD   (800bdf tdf#135198 tdf#138050 sw editing: fix text box position sync)
-=======
-    CPPUNIT_TEST(testTdf138204);
-    CPPUNIT_TEST(testTdf138181);
     CPPUNIT_TEST(testCustomShapeText);
->>>>>>> CHANGE (1aacd8 tdf#138307 Chart import: fix lost custom shape text)
 
     CPPUNIT_TEST_SUITE_END();