mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	Bad merge fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@257883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -4483,7 +4483,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in | ||||
| #ifdef IMAP_STORAGE | ||||
| 				{ | ||||
| 					/* Convert body to native line terminators for IMAP backend */ | ||||
| 					char *line = passdata, *next; | ||||
| 					char *line = ast_str_buffer(str1), *next; | ||||
| 					do { | ||||
| 						/* Terminate line before outputting it to the file */ | ||||
| 						if ((next = strchr(line, '\n'))) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user