From 8a522d22dd3155ca85fedd46d09ab1375ed9487c Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Thu, 9 Jan 2025 15:45:04 +0100 Subject: [PATCH] resolve merge conflict --- cpt-releasenotes.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cpt-releasenotes.rst b/cpt-releasenotes.rst index d3ec7ee..5bc4a40 100644 --- a/cpt-releasenotes.rst +++ b/cpt-releasenotes.rst @@ -49,11 +49,7 @@ NOTE: Testing has shown instances of cache corruption with this release, it will Highlights are: -<<<<<<< HEAD -* Experimental Support for FUSE-T on MacOS, allowing for easy installation without security tweaks -======= * Experimental Support for FUSE-T on MacOS, allowing for easy installation without security tweaks. NOTE: There are some known issues with FUSE-T, do not expext this to be stable yet. ->>>>>>> latest * Refcounted Cache Manager now the default