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

diff --git a/MANIFEST b/MANIFEST
index c12d52a..507b365 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,8 @@
 Build.PL
+<<<<<<< HEAD:MANIFEST
+=======
 Makefile.PL
+>>>>>>> trunk:MANIFEST
 Changes
 MANIFEST
 META.yml