diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/org/org-crypt.el | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/org/org-crypt.el')
| -rw-r--r-- | lisp/org/org-crypt.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el index 4d35cdcf71c..59e44ac00a6 100644 --- a/lisp/org/org-crypt.el +++ b/lisp/org/org-crypt.el @@ -182,6 +182,5 @@ This setting can also be overridden in the CRYPTKEY property." (provide 'org-crypt) -;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e ;;; org-crypt.el ends here |