From 296dc2110067a22b98cde4b8e2080a8ec1d06821 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 4 Mar 2021 14:05:18 +0100 Subject: [PATCH] Conflict in tests --- lib/redmine_dmsf/webdav/base_resource.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb index 87a4fdb1..d4b7113f 100644 --- a/lib/redmine_dmsf/webdav/base_resource.rb +++ b/lib/redmine_dmsf/webdav/base_resource.rb @@ -250,9 +250,7 @@ module RedmineDmsf else @file = DmsfFile.find_file_by_name(@project, @folder, pinfo.first) @folder = nil - unless (pinfo.length < 2 || @subproject || @folder || @file) - raise Conflict - end + raise Conflict unless (pinfo.length < 2 || @file) break # We're at the end end end