Fixed merge hiccup

This commit is contained in:
Phil Nash 2012-11-13 22:03:50 +00:00
parent 42d1b45386
commit ceeebfda49

View File

@ -116,9 +116,6 @@ namespace Catch {
bool empty() const {
return file.empty();
}
bool empty() const {
return file.empty();
}
std::string file;
std::size_t line;