search

jimbraun / XCDF

XCDF: eXplicitly Compacted Data Format. See documentation at Read the Docs:
https://xcdf.readthedocs.io/en/latest/
Other
14 stars 8 forks source link

error: version control conflict marker in FieldNodeDefs.h #82

Closed ilovezfs closed 7 years ago

ilovezfs commented 7 years ago

https://github.com/jimbraun/XCDF/blob/master/include/xcdf/utility/FieldNodeDefs.h#L52-L55

    // Knowing size limits is up to the user
    T operator[](unsigned index) const {
      const T& datum = field_[index];
      return datum;
<<<<<<< HEAD
=======
      //return field_[index];
>>>>>>> 8d9d6fcde1000c8369a52eed108c8461af0de450
    }
    unsigned GetSize() const {return field_.GetSize();}

    const std::string& GetName() const {return field_.GetName();}

So the 3.00.01 release will not build.

jimbraun commented 7 years ago

Fixed with 3.00.02 release

ilovezfs commented 7 years ago

Thanks!