diff options
| author | jeff <jeff> | 2002-02-18 00:21:43 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2002-02-18 00:21:43 +0000 |
| commit | 30bb7613086a767cc50089fd223d21646907359b (patch) | |
| tree | ef8eaadd5cd315a7ceea6505f1d450af01e328c2 | |
| parent | b35b650a6078d645d6f97620f3c79ae941915dd9 (diff) | |
keep accidentally checking in Makefile changes, gotta do something about that...
| -rw-r--r-- | Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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 |