Merge branch 'master' into licensor-mk2

This commit is contained in:
Arfon Smith
2016-03-17 20:24:23 -06:00

View File

@@ -330,7 +330,7 @@ module Linguist
end end
disambiguate ".rpy" do |data| disambiguate ".rpy" do |data|
if /(^(import|from|class|def)[\s\S])/m.match(data) if /(^(import|from|class|def)\s)/m.match(data)
Language["Python"] Language["Python"]
else else
Language["Ren'Py"] Language["Ren'Py"]