]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
projects / thirdparty / curl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c616259)
tests/libtest/Makefile.inc: fixup merge conflict mistake
authorDaniel Stenberg <daniel@haxx.se>
Fri, 9 Sep 2022 13:13:07 +0000 (15:13 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 9 Sep 2022 13:13:15 +0000 (15:13 +0200)
tests/libtest/Makefile.inc patch | blob | blame | history

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 0ca599cfa89b044c449910acd79b92bad6bdb283..d6b3ab37cd8e398cc4374d8f3747e6aef6e05a25 100644 (file)
--- 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 \
Mirror of https://github.com/curl/curl.git