diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2016-11-02 16:19:50 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-11-02 16:19:50 +0100 |
| commit | bad0c7caff62aa90225ae8acee43b297bdc28b25 (patch) | |
| tree | c5ad100b2a0a2f0cdac4fe3b6fb665d38ba40387 /.gitignore | |
| parent | 2409369d3a665f2b8e0b7333f4c2286a61614179 (diff) | |
| parent | 0ce4dd40fc31b4297aa8f237b20c7f5daa46ea32 (diff) | |
Merge branch 'master' of ssh://jrwb.de/mkin into pkgdown
Conflicts:
.Rbuildignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -20,4 +20,3 @@ vignettes/*_cache/ vignettes/*_files/ mkin.Rcheck install.log -test.R |