search

NREL / openstudio-common-measures-gem

Other
7 stars 15 forks source link

XML error due to merge conflict blocks #75

Closed tijcolem closed 3 years ago

tijcolem commented 3 years ago

Looks like a merge conflict blocks (e.g. <<<<<HEAD) got committed into 0.4.0. https://github.com/NREL/openstudio-common-measures-gem/blob/v0.4.0/lib/measures/view_model/measure.xml

I ran grep -r '<<<<<<< HEAD' * and this was the only file that popped up.