resolve merge conflict

cvmfs · Jan 9, 2025 · 8a522d2 · 8a522d2
1 parent 1265192
commit 8a522d2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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