X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=MANIFEST;h=4fa45f6aa465fd136409f47c01ffd061244664d3;hb=733f356351490e03fb55dd80b1e7f6a9acf13025;hp=507b365e188e667c50f24a57d0eda8f5d88ad006;hpb=e84d5e471cbedca0b002e6b529e0e4857141c764;p=catagits%2FTest-NoTabs.git

diff --git a/MANIFEST b/MANIFEST
index 507b365..4fa45f6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,15 +1,22 @@
-Build.PL
-<<<<<<< HEAD:MANIFEST
-=======
-Makefile.PL
->>>>>>> trunk:MANIFEST
 Changes
-MANIFEST
+inc/Module/AutoInstall.pm
+inc/Module/Install.pm
+inc/Module/Install/AutoInstall.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
+lib/Test/NoTabs.pm
+Makefile.PL
+MANIFEST			This list of files
 META.yml
 README
-lib/Test/NoTabs.pm
 t/00-load.t
 t/04-pod.t
 t/05-pod-coverage.t
 t/11-all.t
-t/12-fail.t
\ No newline at end of file
+t/12-fail.t