summaryrefslogtreecommitdiff
path: root/ext/ftp/tests/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'ext/ftp/tests/CONFLICTS')
-rw-r--r--ext/ftp/tests/CONFLICTS1
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/ftp/tests/CONFLICTS b/ext/ftp/tests/CONFLICTS
deleted file mode 100644
index 254defddb5..0000000000
--- a/ext/ftp/tests/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-server