Merging svn trunk into master

[catagits/Test-NoTabs.git] / MANIFEST

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