From 06b4fa999a17f391ad88d4724a723c986b6ed79a Mon Sep 17 00:00:00 2001
From: Manuel Plazas Palacio <manuelplazaspalacio@gmail.com>
Date: Wed, 7 Jun 2023 12:28:04 +0200
Subject: [PATCH] Adding changelog #3935.

---
 changelog/4.0.0_2023-05-29/3935 | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/4.0.0_2023-05-29/3935

diff --git a/changelog/4.0.0_2023-05-29/3935 b/changelog/4.0.0_2023-05-29/3935
new file mode 100644
index 00000000000..d2c8bcea3c3
--- /dev/null
+++ b/changelog/4.0.0_2023-05-29/3935
@@ -0,0 +1,7 @@
+[FEATURE REQUEST] Copy/move conflict solved by users
+
+Displaying a pop-up in case there is a name conflict with the files been moved or copied.
+The pop-up has the options to Skip, Replace and Keep both.
+
+https://github.com/owncloud/android/issues/3935
+https://github.com/owncloud/android/pull/4062
\ No newline at end of file