diff options
| author | Phil Nash | 2012-11-13 22:03:50 +0000 |
|---|---|---|
| committer | Phil Nash | 2012-11-13 22:03:50 +0000 |
| commit | ceeebfda494b82f5dbe3a61ba1350afad0e94968 (patch) | |
| tree | 0ce9b6db548109fb177aee92afec4d75c313dfc7 | |
| parent | 42d1b4538696ecb4cb938a9e43b79084b23ff12e (diff) | |
| download | catch3-ceeebfda494b82f5dbe3a61ba1350afad0e94968.tar.gz | |
Fixed merge hiccup
| -rw-r--r-- | include/internal/catch_common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 41573556..58fbe0ff 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -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; |