diff options
| -rw-r--r-- | coq/coq-syntax.el | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coq/coq-syntax.el b/coq/coq-syntax.el index 18d2df36..00ffa3b7 100644 --- a/coq/coq-syntax.el +++ b/coq/coq-syntax.el @@ -4,11 +4,7 @@ ;; License: GPL (GNU GENERAL PUBLIC LICENSE) ;; Maintainer: Pierre Courtieu <courtieu@lri.fr> -<<<<<<< coq-syntax.el ;; $Id$ -======= -;; $Id$ ->>>>>>> 9.0 (require 'proof-syntax) (require 'coq-db) |