diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:39:06 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:39:06 -0800 |
| commit | 3acc82a8d92d6679f6300105f98b9360fd163934 (patch) | |
| tree | 0f94cd6e9892fa1f90499f3eb566bfdd1a4f7a43 | |
| parent | a93c5bbcb3c6ebec1937c01e17c8f0f58e65dda6 (diff) | |
| download | gitlab-ce-3acc82a8d92d6679f6300105f98b9360fd163934.tar.gz | |
Resolve conflicts in 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 } |