Remove a blank line causing a merge conflict with patches I want to apply.

lisp/org.el

@@ -210,7 +210,6 @@ identifier."
 ;;; Version
 
 (defvaralias 'org-version 'org-release)
-
 ;;;###autoload
 (defun org-version (&optional here)
   "Show the org-mode version in the echo area.