KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-08 12:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1623-local

Browse Source 
Conflicts:
	lib/linguist/heuristics.rb
This commit is contained in:
Arfon Smith
2014-11-02 20:12:59 -06:00
parent 9d8ab16a38 e8cf750e18
commit 20814ec533
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/linguist/heuristics.rb
View File

@@ -25,9 +25,12 @@ module Linguist
if languages.all? { |l| ["Common Lisp", "OpenCL"].include?(l) } if languages.all? { |l| ["Common Lisp", "OpenCL"].include?(l) }
result = disambiguate_cl(data, languages) result = disambiguate_cl(data, languages)
end end
<<<<<<< HEAD
if languages.all? { |l| ["Scala", "SuperCollider"].include?(l) } if languages.all? { |l| ["Scala", "SuperCollider"].include?(l) }
result = disambiguate_sc(data, languages) result = disambiguate_sc(data, languages)
end end
=======
>>>>>>> master
if languages.all? { |l| ["AsciiDoc", "AGS Script"].include?(l) } if languages.all? { |l| ["AsciiDoc", "AGS Script"].include?(l) }
result = disambiguate_asc(data, languages) result = disambiguate_asc(data, languages)
end end