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-vm.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-vm.el')
-rw-r--r-- | lisp/org/org-vm.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el index f1fbca7aaa1..4f138236524 100644 --- a/lisp/org/org-vm.el +++ b/lisp/org/org-vm.el @@ -138,6 +138,5 @@ (provide 'org-vm) -;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d ;;; org-vm.el ends here |