From ceeebfda494b82f5dbe3a61ba1350afad0e94968 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Tue, 13 Nov 2012 22:03:50 +0000
Subject: [PATCH] Fixed merge hiccup

---
 include/internal/catch_common.h | 3 ---
 1 file changed, 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;