projects
/
catagits/Test-NoTabs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
fc9e258
)
Merging svn trunk into master
Nick Gerakines [Tue, 23 Dec 2008 18:18:52 +0000 (10:18 -0800)]
Changes
patch
|
blob
|
blame
|
history
MANIFEST
patch
|
blob
|
blame
|
history
diff --git
a/Changes
b/Changes
index
2da10ee
..
bc07902
100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-8,4
+8,4
@@
Revision history for Test-NoTabs
- Added Makefile.PL for compatibility
0.3 2006-08-26
- - Added missing dependancy (Test::Group)
\ No newline at end of file
+ - Added missing dependancy (Test::Group)
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