fixing merge conflict in vendor.yml

lib/linguist/languages.yml

@@ -802,6 +802,9 @@ INI:
   - .prefs
   - .properties
   primary_extension: .ini
+  
+Inno Setup:
+  primary_extension: .iss
 
 Idris:
   type: programming
@@ -1097,6 +1100,14 @@ Mercury:
   # Mercury's syntax is not prolog syntax, but they do share the lexer
   lexer: Prolog
 
+Mercury:
+  type: programming
+  # This is the background colour on the web page.
+  color: "#abcdef"
+  primary_extension: .m
+  # Mercury's syntax is not prolog syntax, but they do share the lexer
+  lexer: Prolog
+
 MiniD: # Legacy
   searchable: false
   primary_extension: .minid # Dummy extension

lib/linguist/vendor.yml

@@ -41,7 +41,6 @@
 - foundation.css
 
 # Vendored dependencies
-- thirdparty/
 - vendors?/
 
 # Debian packaging