KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/1042/head' of github.com:github/linguist into 1042

Browse Source 
Conflicts:
	lib/linguist/vendor.yml
This commit is contained in:
Arfon Smith
2014-06-06 12:32:30 -05:00
parent 1fd0732390 f66ffe305f
commit 50ab58e91f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/linguist/vendor.yml
View File

@@ -201,6 +201,6 @@
- Mercury/ - Mercury/
# R packages # R packages
- vignettes/ - ^vignettes/
- inst/extdata/ - ^inst/extdata/