diff options
Diffstat (limited to 'spec/lib/safe_zip/extract_spec.rb')
| -rw-r--r-- | spec/lib/safe_zip/extract_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/lib/safe_zip/extract_spec.rb b/spec/lib/safe_zip/extract_spec.rb index 9c9a3f2fe93..b75a8fede00 100644 --- a/spec/lib/safe_zip/extract_spec.rb +++ b/spec/lib/safe_zip/extract_spec.rb @@ -36,11 +36,7 @@ describe SafeZip::Extract do end end -<<<<<<< HEAD %w(valid-simple.zip valid-symlinks-first.zip valid-non-writeable.zip).each do |name| -======= - %w(valid-simple.zip valid-symlinks-first.zip valid-non-writeable.zip).each do |name| ->>>>>>> dev/master context "when using #{name} archive" do let(:archive_name) { name } |