bug-apl
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

../NamedObject.hh:85:1: error: version control conflict marker in file

From: Hans-Peter Sorge
Subject: ../NamedObject.hh:85:1: error: version control conflict marker in file
Date: Tue, 8 Mar 2022 23:22:52 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0
Hi,

I get a compile error.

Fedora 35,  Kernel 5.16.12-200.fc35.x86_64


In file included from ../Function.hh:27,
                from ../PrimitiveFunction.hh:27,
                from ../PrimitiveOperator.hh:24,
                from ../Quad_FIO.hh:29,
                from file_io.cc:26:
../NamedObject.hh:85:1: error: version control conflict marker in file
  85 | <<<<<<< .mine
     | ^~~~~~~
../NamedObject.hh:90:1: error: expected unqualified-id before ‘||’ token
  90 | ||||||| .r1524
     | ^~
../NamedObject.hh:95:1: error: version control conflict marker in file
  95 | =======
     | ^~~~~~~

Greetings
Hans-Peter
reply via email to
[Prev in Thread] Current Thread [Next in Thread]