From 3acc82a8d92d6679f6300105f98b9360fd163934 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 5 Feb 2019 14:39:06 -0800 Subject: Resolve conflicts in spec/lib/safe_zip/extract_spec.rb --- spec/lib/safe_zip/extract_spec.rb | 4 ---- 1 file changed, 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 } -- cgit v1.2.3