diff options
| author | Max Kellermann <max@duempel.org> | 2011-12-13 19:48:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-12-13 19:48:33 +0100 |
| commit | 34aab116aee5fb7aa128c86ce8377f62ae63fe6e (patch) | |
| tree | 7dba842fe8a544a5b9dbf1279cdefc5a180b3492 /src/pcm_buffer.c | |
| parent | 33232face9e864618b5125b9dd83ee760f1116e4 (diff) | |
pcm_buffer: eliminate merge conflict fallout
Diffstat (limited to 'src/pcm_buffer.c')
| -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 b277e768..515ac856 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 |