From dd81e06afc1f39657a6fe42ce53091c89833e39b Mon Sep 17 00:00:00 2001
From: David Aspinall
Date: Thu, 31 Jan 2008 21:19:01 +0000
Subject: Remove CVS merge junk!

---
 coq/coq-syntax.el | 4 ----
 1 file changed, 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)
-- 
cgit v1.2.3