fixed Merge conflicts

Library/Homebrew/utils/repology.rb

@@ -25,16 +25,6 @@ module RepologyParser
     puts "\n- Paginating repology api page: #{page_no}"
 
     outdated_packages = query_repology_api("")
-<<<<<<< HEAD
-    last_package_index = outdated_packages.size - 1
-    response_size = outdated_packages.size
-
-    while response_size > 1 do
-      page_no += 1
-      puts "\n- Paginating repology api page: #{page_no}"
-
-      last_package_in_response = outdated_packages.keys[last_package_index]
-=======
     last_pacakge_index = outdated_packages.size - 1
     response_size = outdated_packages.size
 
@@ -43,47 +33,10 @@ module RepologyParser
       puts "\n- Paginating repology api page: #{page_no}"
 
       last_package_in_response = outdated_packages.keys[last_pacakge_index]
->>>>>>> 14d63f61a5d3c5ca41d89c670a4bd58cab84aa6c
       response = query_repology_api("#{last_package_in_response}/")
 
       response_size = response.size
       outdated_packages.merge!(response)
-<<<<<<< HEAD
-      last_package_index = outdated_packages.size - 1
-    end
-
-    puts "\n- #{outdated_packages.size} outdated packages identified"
-
-    outdated_packages
-  end
-
-  def validate__repology_packages(outdated_repology_packages, brew_formulas)
-    puts "\n---- Verify Outdated Repology Packages as Homebrew Formulae -----"
-
-    packages = {}
-
-    outdated_repology_packages.each do |name, repositories|
-      # identify homebrew repo
-      repology_homebrew_repo = repositories.select do
-         |repo| repo['repo'] == 'homebrew'
-      end.first
-
-      next if repology_homebrew_repo.empty?
-      latest_version = nil
-
-      #identify latest version amongst repology repos
-      repositories.each do |repo|
-        latest_version = repo['version'] if repo['status'] == 'newest'
-      end
-
-      packages[repology_homebrew_repo['srcname']] = {
-        'repology_latest_version' => latest_version,
-      }
-    end
-    # hash of hashes {'openclonk' => {repology_latest_version => 7.0}, ..}
-    packages
-  end
-=======
       last_pacakge_index = outdated_packages.size - 1
     end
 
@@ -91,5 +44,4 @@ module RepologyParser
 
     outdated_packages
   end
->>>>>>> 14d63f61a5d3c5ca41d89c670a4bd58cab84aa6c
 end