From b437f71da954827ed0e123445e35943face5910b Mon Sep 17 00:00:00 2001
From: Attila Lendvai <attila.lendvai@gmail.com>
Date: Wed, 31 Oct 2007 19:38:31 +0200
Subject: [PATCH] fix: darcs merge conflict was recorded into package.lisp

---
 package.lisp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package.lisp b/package.lisp
index 4abfaff..0efaf8a 100644
--- a/package.lisp
+++ b/package.lisp
@@ -117,13 +117,8 @@
    #:coercef
    ;; Conditions
    #:required-argument
-v v v v v v v
    #:ignore-some-conditions
-   ;; Features
-   #:featurep
-*************
    #:simple-style-warning
    ;; Features
    #:featurep
-^ ^ ^ ^ ^ ^ ^
    ))
-- 
2.11.4.GIT