fix bad conflict resolution between ivan's and jeff's idea of how to use a different...

[freeside.git] / conf / smtpmachine

diff --git a/conf/smtpmachine b/conf/smtpmachine
index fa7963c..2fbb50c 100644 (file)
--- a/conf/smtpmachine
+++ b/conf/smtpmachine
@@ -1 +1 @@
-mail
+localhost