Fix conflicts in services

app/services/projects/update_pages_service.rb

@@ -99,15 +99,10 @@ module Projects
       # -n  never overwrite existing files
       # We add * to end of SITE_PATH, because we want to extract SITE_PATH and all subdirectories
       site_path = File.join(SITE_PATH, '*')
-<<<<<<< HEAD
       build.artifacts_file.use_file do |artifacts_path|
-        unless system(*%W(unzip -n #{artifacts_path} #{site_path} -d #{temp_path}))
+        unless system(*%W(unzip -qq -n #{artifacts_path} #{site_path} -d #{temp_path}))
           raise 'pages failed to extract'
         end
-=======
-      unless system(*%W(unzip -qq -n #{artifacts} #{site_path} -d #{temp_path}))
-        raise 'pages failed to extract'
->>>>>>> ce/master
       end
     end