projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
trading in tar for rsync for improved vpopmail support
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
283981a
..
3425973
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,8
+6,14
@@
DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
DB_USER = freeside
DB_PASSWORD=
+<<<<<<< Makefile
+#TEMPLATE = asp
+#mason's a bit dodgy still
+TEMPLATE = mason
+=======
TEMPLATE = asp
#TEMPLATE = mason
+>>>>>>> 1.27
ASP_GLOBAL = /usr/local/etc/freeside/asp-global