diff options
| author | Reiner Steib | 2006-09-15 09:03:48 +0000 |
|---|---|---|
| committer | Reiner Steib | 2006-09-15 09:03:48 +0000 |
| commit | efce5ce20161481055bca6fe3fab25d6a54d0a3e (patch) | |
| tree | ecc5b5ee6405fcb4324c779e1061055a7dec4cfd /admin | |
| parent | 91a2acb229ac102ef15866174fb2d62c8e36598c (diff) | |
| download | emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.tar.gz emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.zip | |
Fix previous commit: Remove conflict marker. Undo unification of Pavel
Janik's name.
Diffstat (limited to 'admin')
0 files changed, 0 insertions, 0 deletions