merge

diff --cc lib/compress/zstd_compress.c
index 73e6618c1a5061286bed3b94a46e0a09f9b7d6c5,6113df4b27437abff9cd753706a64b24451a3fcf..202ca037f50bf929ea162947cc99284e442e1a7d
--- 1/lib/compress/zstd_compress.c
--- 2/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -3240,18 -3254,6 +3266,8 @@@ ZSTD_CDict* ZSTD_createCDict_advanced(c
          assert(cdict != NULL);
          ZSTD_cwksp_move(&cdict->workspace, &ws);
          cdict->customMem = customMem;
- <<<<<<< HEAD
- <<<<<<< HEAD
- =======
-         cdict->workspace = workspace;
-         cdict->workspaceSize = workspaceSize;
-         cdict->compressionLevel = 0; /* signals advanced API usage */
- 
- >>>>>>> Fix error
- =======
 +        cdict->compressionLevel = 0; /* signals advanced API usage */
 +
- >>>>>>> merge conflicts round 2
          if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
                                          dictBuffer, dictSize,
                                          dictLoadMethod, dictContentType,

diff --cc lib/zstd.h
Simple merge