From c4cad9f80bc2d581570c572ac4ed0e4c971a6c91 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Wed, 16 May 2012 23:46:36 +0200
Subject: [PATCH] Fix merge conflict.

---
 lisp/org.el | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 1b68d88bd..269275713 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -209,13 +209,8 @@ identifier."
 
 ;;; Version
 
-<<<<<<< HEAD
 (defvaralias 'org-version 'org-release)
-=======
-(defconst org-version "7.8.10"
-  "The version number of the file org.el.")
 
->>>>>>> maint
 ;;;###autoload
 (defun org-version (&optional here)
   "Show the org-mode version in the echo area.