1 files changed, 0 insertions, 6 deletions
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