[#200934] p8 FAILED (try 2) uniset-2.0.git=2.7-alt3.M80P.4

[Girar Builder awaiter robot]

http://git.altlinux.org/tasks/200934/logs/events.2.1.log

2018-Feb-25 17:44:23 :: task #200934 for p8 resumed by pv:
#100 build 2.7-alt3.M80P.4 from /people/pv/packages/uniset-2.0.git
2018-Feb-25 17:44:23 :: [i586] #100 uniset-2.0.git 2.7-alt3.M80P.4: build start
2018-Feb-25 17:44:23 :: [x86_64] #100 uniset-2.0.git 2.7-alt3.M80P.4: build start
In file included from Element.cc:19:0:
Element.h:65:1: error: expected unqualified-id before '<<' token
 <<<<<<< HEAD
Element.h:69:1: error: expected unqualified-id before '>>' token
 >>>>>>> 2.7-alt4
Element.h:134:1: error: expected unqualified-id before '<<' token
 <<<<<<< HEAD
Element.h:139:1: error: expected unqualified-id before '==' token
Element.h:141:1: error: expected unqualified-id before '>>' token
 >>>>>>> 2.7-alt4
Element.h:165:24: error: 'virtual std::__cxx11::string uniset::TAND::getType() const' marked 'override', but does not override
    virtual std::string getType() const override
Element.h:193:24: error: 'virtual std::__cxx11::string uniset::TNOT::getType() const' marked 'override', but does not override
    virtual std::string getType() const override
Element.cc: In member function 'virtual void uniset::Element::addChildOut(std::shared_ptr<uniset::Element>&, size_t)':
Element.cc:44:39: error: 'class uniset::Element' has no member named 'getId'
     msg << "(" << myid << "):" << el->getId() << " уже есть в списке дочерних(такое соединение уже есть)...";
Element.cc:55:24: error: 'class uniset::Element' has no member named 'getId'
    msg << " id" << el->getId() << " имеет в своих 'потомках' Element id=" << myid << endl;
Element.cc: At global scope:
Element.cc:88:1: error: expected unqualified-id before '<<' token
 <<<<<<< HEAD
2018-Feb-25 17:50:58 :: [x86_64] uniset-2.0.git 2.7-alt3.M80P.4: remote: build failed
2018-Feb-25 17:50:58 :: [x86_64] #100 uniset-2.0.git 2.7-alt3.M80P.4: build FAILED
In file included from Element.cc:19:0:
Element.h:65:1: error: expected unqualified-id before '<<' token
 <<<<<<< HEAD
Element.h:69:1: error: expected unqualified-id before '>>' token
 >>>>>>> 2.7-alt4
Element.h:134:1: error: expected unqualified-id before '<<' token
 <<<<<<< HEAD
Element.h:139:1: error: expected unqualified-id before '==' token
Element.h:141:1: error: expected unqualified-id before '>>' token
 >>>>>>> 2.7-alt4
Element.h:165:24: error: 'virtual std::__cxx11::string uniset::TAND::getType() const' marked 'override', but does not override
    virtual std::string getType() const override
Element.h:193:24: error: 'virtual std::__cxx11::string uniset::TNOT::getType() const' marked 'override', but does not override
    virtual std::string getType() const override
Element.cc: In member function 'virtual void uniset::Element::addChildOut(std::shared_ptr<uniset::Element>&, size_t)':
Element.cc:44:39: error: 'class uniset::Element' has no member named 'getId'
     msg << "(" << myid << "):" << el->getId() << " уже есть в списке дочерних(такое соединение уже есть)...";
Element.cc:55:24: error: 'class uniset::Element' has no member named 'getId'
    msg << " id" << el->getId() << " имеет в своих 'потомках' Element id=" << myid << endl;
Element.cc: At global scope:
Element.cc:88:1: error: expected unqualified-id before '<<' token
 <<<<<<< HEAD
2018-Feb-25 17:51:24 :: [i586] uniset-2.0.git 2.7-alt3.M80P.4: remote: build failed
2018-Feb-25 17:51:24 :: [i586] #100 uniset-2.0.git 2.7-alt3.M80P.4: build FAILED
2018-Feb-25 17:50:58 :: [x86_64] build FAILED
2018-Feb-25 17:51:25 :: [i586] build FAILED
2018-Feb-25 17:51:25 :: task #200934 for p8 FAILED