mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-26 15:26:11 +01:00
Fixed merge hiccup
This commit is contained in:
parent
42d1b45386
commit
ceeebfda49
@ -116,9 +116,6 @@ namespace Catch {
|
|||||||
bool empty() const {
|
bool empty() const {
|
||||||
return file.empty();
|
return file.empty();
|
||||||
}
|
}
|
||||||
bool empty() const {
|
|
||||||
return file.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string file;
|
std::string file;
|
||||||
std::size_t line;
|
std::size_t line;
|
||||||
|
Loading…
Reference in New Issue
Block a user