From 3bc0dcde0c70d099cf8c42a40880d04f6ed9d845 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 14 Jan 2022 13:45:25 -0800 Subject: [PATCH] Fix merge conflicts. --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 4ad601f..6720153 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,8 @@ $ cargo add fd-lock ``` ## Safety -<<<<<<< HEAD -This crate uses `unsafe` to interface with `libc` and `windows-sys`. All +This crate uses `unsafe` on Windows to interface with `windows-sys`. All invariants have been carefully checked, and are manually enforced. -======= -This crate uses `unsafe` on Windows to interface with `winapi`. All invariants -have been carefully checked, and are manually enforced. ->>>>>>> 96badb5 (Use rustix instead of calling libc directly.) ## Contributing Want to join us? Check out our ["Contributing" guide][contributing] and take a