From c6e83720f718bc6923fd1ed725a673352e2140a1 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Sun, 18 Jul 2021 21:37:54 +0900 Subject: [PATCH] Update CHANGELOG.md --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32dab05..ac49322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,4 @@ # 0.3.2 -<<<<<<< HEAD -- Updated Ouroboros to 0.10.0 to fix possible UB -- Remove `Box` from many places in the UVC Backend -======= - Bumped `ouroboros` to avoid potential UB - [INTERNAL] Removed `Box` from many internal struct fields of `UVCCaptureDevice`