From b76d23e45af347ea5d11ddad813ad4521167b9c5 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 18 Mar 2019 16:36:48 -0400
Subject: [PATCH] news fragment

---
 newsfragments/2965.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 newsfragments/2965.bugfix

diff --git a/newsfragments/2965.bugfix b/newsfragments/2965.bugfix
new file mode 100644
index 000000000..58d4582e8
--- /dev/null
+++ b/newsfragments/2965.bugfix
@@ -0,0 +1 @@
+Magic-Folders now creates spurious conflict files in fewer cases.  In particular, if files are added to the folder while a client is offline, that client will not create conflict files for all those new files when it starts up.