From 9382a3c628dc773c387f8fb7ea44ec05aaacdc46 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 23 May 2023 23:54:51 -0700 Subject: [PATCH] Fix manifest file after bad merge --- manifest.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/manifest.scm b/manifest.scm index b16155c..2a13869 100644 --- a/manifest.scm +++ b/manifest.scm @@ -1,7 +1,4 @@ -<<<<<<< HEAD -(specifications->manifest '("emacs-eldev")) -======= (packages->manifest (list - (specification->package "emacs-eldev"))) ->>>>>>> d9c1ac7 (Add manifest.scm for easy dev environment with Guix) + (specification->package "emacs-eldev") + (specification->package "emacs-htmlize")))