diff options
| -rw-r--r-- | src/pcm_buffer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c index b277e768e..515ac8560 100644 --- a/src/pcm_buffer.c +++ b/src/pcm_buffer.c @@ -1,9 +1,5 @@ /* -<<<<<<< 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 |