Closed petertorelli closed 5 years ago
It appears the main.cpp file was committed with unresolved merge headers.
Fixed in 839d435bbb8951c4807b2d63a14ce3ce0ca2146a
It appears the main.cpp file was committed with unresolved merge headers.