Skip to content
Snippets Groups Projects
Commit 3e74ad53 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

[*] Conflict resolved

parent 91b7c1c5
No related branches found
No related tags found
No related merge requests found
Pipeline #10424 passed with stage
in 9 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
dap-sdk/core/libdap.pri
+ 0
− 3
View file @ 3e74ad53
...@@ -53,13 +53,10 @@ win32 { ...@@ -53,13 +53,10 @@ win32 {
HEADERS += $$PWD/../../3rdparty/uthash/src/utlist.h \ HEADERS += $$PWD/../../3rdparty/uthash/src/utlist.h \
$$PWD/../../3rdparty/uthash/src/uthash.h $$PWD/../../3rdparty/uthash/src/uthash.h
<<<<<<< HEAD
=======
#if(DAPSDK_MODULES MATCHES "ssl-support") #if(DAPSDK_MODULES MATCHES "ssl-support")
# include($$PWD/../../3rdparty/wolfssl/wolfssl.pri) # include($$PWD/../../3rdparty/wolfssl/wolfssl.pri)
#endif() #endif()
>>>>>>> bd29a4e40515ee89520114dd5287c289e5f83b02
# Sources itself # Sources itself
HEADERS += $$PWD/include/dap_common.h \ HEADERS += $$PWD/include/dap_common.h \
$$PWD/include/dap_binary_tree.h \ $$PWD/include/dap_binary_tree.h \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment