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

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 }