GIT: remove remnants of conflict

This commit is contained in:
Andrew Heather
2015-12-09 10:20:10 +00:00
parent d52b01c806
commit dc64f53924

View File

@ -924,8 +924,6 @@ int main(int argc, char *argv[])
}
>>>>>>> develop
Info<< endl;
// From renumbering: