diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-18 08:29:38 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-18 08:29:38 +0200 |
| commit | 7faffad1907995f1b623ede8fc2e386693428e22 (patch) | |
| tree | 6c68057b690daabf566a1d4825e177af1d8b9355 /.gitignore | |
| parent | 53099978c971ee8e5c94e67bf972f51629d67fd3 (diff) | |
| parent | fef0bb7fe916f91dcff089c17aa3290c0ea1ab1f (diff) | |
Merge branch 'master' into pfm_chent
Conflicts:
pkg/DESCRIPTION
pkg/NAMESPACE
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4,3 +4,4 @@ pfm\.Rcheck pkg/ChangeLog test.R README.html +pkg/inst/extdata/Tabelle\ der\ Abdrifteckwerte.xls |