From: jeff <jeff>
Date: Mon, 18 Feb 2002 00:21:43 +0000 (+0000)
Subject: keep accidentally checking in Makefile changes, gotta do something about that...
X-Git-Tag: freeside_1_4_0pre11~44
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=30bb7613086a767cc50089fd223d21646907359b

keep accidentally checking in Makefile changes, gotta do something about that...
---

diff --git a/Makefile b/Makefile
index 34259737b..283981a87 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,8 @@ 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