From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 9 Sep 2022 13:13:07 +0000 (+0200)
Subject: tests/libtest/Makefile.inc: fixup merge conflict mistake
X-Git-Tag: curl-7_86_0~269
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e34da091ab26597ae281123e166c31f22865f5;p=thirdparty%2Fcurl.git

tests/libtest/Makefile.inc: fixup merge conflict mistake
---

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 0ca599cfa8..d6b3ab37cd 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -66,7 +66,6 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect                \
  lib1933 lib1934 lib1935 lib1936 lib1937 lib1938 lib1939 lib1940 \
  lib1945 lib1946 lib1947 \
  lib2301 lib2302 \
->>>>>>> 265a739f6 (tests: add websockets tests)
  lib3010 lib3025 lib3026 lib3027
 
 chkdecimalpoint_SOURCES = chkdecimalpoint.c ../../lib/mprintf.c \