Merge branch 'master' into devel

* master: ignore .git dir, not content From: Laurent <lg390@cam.ac.uk> git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@127701 bc3139a8-67e5-0310-9ffc-ced21a209358
sneumann · Mar 25, 2017 · d85ae5c · d85ae5c
1 parent ec15d24
commit d85ae5c
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -2,20 +2,6 @@
 ^.git$
 ^.*\.Rproj$
 ^\.Rproj\.user$
-branches
-COMMIT_EDITMSG
-config
-description
-FETCH_HEAD
-HEAD
-hooks
-index
-info
-logs
-objects
-ORIG_HEAD
-packed-refs
-refs
-svn
+.git
 .gitignore
 .travis.yml