From d2b03b1aea01ca7c976bc837e2ddfbc5d646abc9 Mon Sep 17 00:00:00 2001
From: Matt Mastracci <matthew@mastracci.com>
Date: Wed, 26 Jul 2023 12:39:56 -0400
Subject: [PATCH] Update sync.rs

---
 ext/fs/sync.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ext/fs/sync.rs b/ext/fs/sync.rs
index a263b92e97..091ea076c4 100644
--- a/ext/fs/sync.rs
+++ b/ext/fs/sync.rs
@@ -45,12 +45,9 @@ mod inner {
 
 #[cfg(not(feature = "sync_fs"))]
 mod inner {
-  pub use std::rc::Rc as MaybeArc;
-<<<<<<< HEAD
-=======
   use std::ops::Deref;
   use std::ops::DerefMut;
->>>>>>> 2e7254f2a (fix(ext/fs): fix MaybeArc when not sync_fs)
+  pub use std::rc::Rc as MaybeArc;
 
   pub trait MaybeSync {}
   impl<T> MaybeSync for T where T: ?Sized {}