From b058173c6cbc44186cf41ab2e7545a94b35cff79 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 17 Mar 2012 14:43:21 +0100 Subject: [PATCH] Don't use the "Version:" tag elsewhere than in org.el This commit prepares the maint>master merge, which otherwise results in merge conflicts. --- lisp/ob-fortran.el | 1 - lisp/org-eshell.el | 1 - 2 files changed, 2 deletions(-) diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el index 283f1ce46..e9ff78dcd 100644 --- a/lisp/ob-fortran.el +++ b/lisp/ob-fortran.el @@ -5,7 +5,6 @@ ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Keywords: literate programming, reproducible research, fortran ;; Homepage: http://orgmode.org -;; Version: 7.8.03 ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el index c386af86b..de6f9fb1d 100644 --- a/lisp/org-eshell.el +++ b/lisp/org-eshell.el @@ -3,7 +3,6 @@ ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Konrad Hinsen -;; Version: 0.1 ;; This file is part of GNU Emacs. -- 2.11.4.GIT