Fixed merge hiccup

2012-11-13 22:03:50 +00:00 · 2012-11-13 22:03:50 +00:00 · ceeebfda49
parent 42d1b45386
commit ceeebfda49
1 changed files with 0 additions and 3 deletions
--- 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;