Remove a blank line causing a merge conflict with patches I want to apply. · e06fff3e50 - Flintfam Git Service

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

Bastien Guerry 13 years ago

parent

443398b766

commit

e06fff3e50

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
lisp/org.el
							 
								View File
							
				@@ -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.