diff options
Diffstat (limited to 'src/pcm_buffer.c')
| -rw-r--r-- | src/pcm_buffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c index b0449d44..b277e768 100644 --- a/src/pcm_buffer.c +++ b/src/pcm_buffer.c @@ -1,5 +1,9 @@ /* +<<<<<<< HEAD + * Copyright (C) 2003-2011 The Music Player Daemon Project +======= * Copyright (C) 2003-2010 The Music Player Daemon Project +>>>>>>> v0.16.x * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify |