Index: apps/app_senddtmf.c
===================================================================
--- apps/app_senddtmf.c	(revision 20901)
+++ apps/app_senddtmf.c	(working copy)
@@ -94,7 +94,6 @@
 	return res;
 }
 
-<<<<<<< .working
 static char mandescr_playdtmf[] =
 	"Description: Plays a DTMF digit on the specified channel.\n"
 	"Variables: (all are required)\n"
Index: formats/format_pcm.c
===================================================================
--- formats/format_pcm.c	(revision 20901)
+++ formats/format_pcm.c	(working copy)
@@ -455,7 +455,7 @@
 	.tell = pcm_tell,
 	.read = pcm_read,
 	.buf_size = (BUF_SIZE * 2) + AST_FRIENDLY_OFFSET,
-	.lockp = &me,
+	.module = &mod_data, /* XXX */
 };
 
 static const struct ast_format au_f = {