projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix bad conflict resolution between ivan's and jeff's idea of how to use a different...
[freeside.git]
/
FS
/
MANIFEST
diff --git
a/FS/MANIFEST
b/FS/MANIFEST
index
6e9bafb
..
56f7af0
100644
(file)
--- a/
FS/MANIFEST
+++ b/
FS/MANIFEST
@@
-535,3
+535,5
@@
FS/svc_CGP_Mixin.pm
FS/svc_CGPRule_Mixin.pm
FS/svc_cert.pm
t/svc_cert.t
+FS/part_pkg_discount.pm
+t/part_pkg_discount.t