Commit 3acc82a8 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in spec/lib/safe_zip/extract_spec.rb

parent a93c5bbc
...@@ -36,11 +36,7 @@ describe SafeZip::Extract do ...@@ -36,11 +36,7 @@ describe SafeZip::Extract do
end end
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|
=======
%w(valid-simple.zip valid-symlinks-first.zip valid-non-writeable.zip).each do |name|
>>>>>>> dev/master
context "when using #{name} archive" do context "when using #{name} archive" do
let(:archive_name) { name } let(:archive_name) { name }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment