[libtheschwartz-perl] 30/43: fix merge damage

[dom at earth.li]

This is an automated email from the git hooks/post-receive script.

dom pushed a commit to branch master
in repository libtheschwartz-perl.

commit 013579e4c4d3adab214f4d4a30702194ed536533
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sat Feb 15 16:58:41 2014 +0000

    fix merge damage
---
 MANIFEST | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 7f23795..6a4d415 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,13 +1,10 @@
-CHANGES
-MANIFEST			This list of files
-MANIFEST.SKIP
-META.yml
-Makefile.PL
 bin/schwartzmon
+CHANGES
 doc/http-mappings.txt
 doc/notes.txt
 doc/schema-postgres.sql
 doc/schema.sql
+extras/check_schwartz
 extras/TheSchwartz.spec
 extras/thetop
 inc/Module/AutoInstall.pm

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtheschwartz-perl.git