From 079d3151a0a0c9d279b6fab092dae96f9fc0f286 Mon Sep 17 00:00:00 2001
From: chrchr-github <christian.riesch@live.com>
Date: Sun, 20 Aug 2023 00:27:16 +0200
Subject: [PATCH] Fix merge

---
 test/teststring.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/test/teststring.cpp b/test/teststring.cpp
index 9ea166688d9..87ffcccaaf0 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -760,13 +760,6 @@ class TestString : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout.str());
 
-        check("void g(bool);\n"
-              "    void f(std::map<std::string, std::vector<int>>&m) {\n"
-              "    if (m.count(\"abc\"))\n"
-              "        g(m[\"abc\"][0] ? true : false);\n"
-              "}\n");
-        ASSERT_EQUALS("", errout.str());
-
         check("void g(bool b);\n"
               "void f() {\n"
               "    g('\\0');\n"