X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=34259737bba37f8175f4a030e0a66d8c843080ec;hp=dd134ebfc49b702d64e262653641529c2ae74018;hb=b35b650a6078d645d6f97620f3c79ae941915dd9;hpb=0dc8c09556f5e74b5a58931e40c2da06619a6be7

diff --git a/Makefile b/Makefile
index dd134ebfc..34259737b 100644
--- 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