diff --cc conf/app.ini
Simple merge
diff --cc modules/mailer/mail.go
Simple merge
diff --cc modules/mailer/mailer.go
Simple merge
author	无闻 <u@gogs.io>
	Sun, 21 Dec 2014 06:55:28 +0000 (01:55 -0500)
committer	无闻 <u@gogs.io>
	Sun, 21 Dec 2014 06:55:28 +0000 (01:55 -0500)
		1	2
conf/app.ini	patch \|	diff1 \|	diff2 \|	blob \| history
modules/mailer/mail.go	patch \|	diff1 \|	diff2 \|	blob \| history
modules/mailer/mailer.go	patch \|	diff1 \|	diff2 \|	blob \| history