| commit | d968c52d38b7f45c8575f31bd3a91681e2704409 | [log] [tgz] |
|---|---|---|
| author | Laurence Lundblade <lgl@securitytheory.com> | Sat Dec 16 21:46:05 2023 -0700 |
| committer | Laurence Lundblade <lgl@securitytheory.com> | Sat Dec 16 21:46:05 2023 -0700 |
| tree | 63f10afe7f5e43bef1be802e95898a469663c6ea | |
| parent | 6d72769db8776568ddd625f17a650aa9f62ae947 [diff] |
straggler conflict marker
diff --git a/inc/qcbor/qcbor_spiffy_decode.h b/inc/qcbor/qcbor_spiffy_decode.h index 1efebcf..9b157a0 100644 --- a/inc/qcbor/qcbor_spiffy_decode.h +++ b/inc/qcbor/qcbor_spiffy_decode.h
@@ -912,7 +912,6 @@ * implementation can track. * * See also QCBORDecode_GetItemInMapN(). ->>>>>>> master */ void QCBORDecode_GetItemsInMap(QCBORDecodeContext *pCtx, QCBORItem *pItemList);