Fix conflict in app/services/projects/update_pages_service.rb

aada95e0 · Jacob Vosmaer · 723c09cc · aada95e0
Commit aada95e0 authored Apr 06, 2018 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/services/projects/update_pages_service.rb app/services/projects/update_pages_service.rb +0 -4

No files found.
--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
@@ -74,11 +74,7 @@ module Projects
    end
    def extract_archive!(temp_path)
-<<<<<<< HEAD
      if artifacts_filename.ends_with?('.zip')
-=======
-      if artifacts.ends_with?('.zip')
->>>>>>> upstream/master
        extract_zip_archive!(temp_path)
      else
        raise InvaildStateError, 'unsupported artifacts format'