Skip to content

M
mpd
Commit 34aab116 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

pcm_buffer: eliminate merge conflict fallout

parent 33232fac
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
src/pcm_buffer.c
View file @ 34aab116
/* /*
<<<<<<< HEAD
* Copyright (C) 2003-2011 The Music Player Daemon Project * 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 * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment