mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 20:27:11 +01:00 
			
		
		
		
	Fixed merge hiccup
This commit is contained in:
		| @@ -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;         | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Phil Nash
					Phil Nash