diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-08-26 14:17:48 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-08-26 14:17:48 +0200 |
| commit | 6156796699845eca57ae1b8515016deb14d445e6 (patch) | |
| tree | 3136473a8c87397984e73061b34bbc8ca6a29935 /.gitignore | |
| parent | 83c8575e2abde12208584b9c80935d4a873689fd (diff) | |
| parent | 1ec3ee4a03d4e47fdd3be1bcbe754e478353410b (diff) | |
Merge branch 'master' into pfm_chent
Conflicts:
pkg/DESCRIPTION
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -3,5 +3,4 @@ pfm*\.tar.gz pfm\.Rcheck pkg/ChangeLog test.R -README.html pkg/inst/extdata/Tabelle\ der\ Abdrifteckwerte.xls |