From 34aab116aee5fb7aa128c86ce8377f62ae63fe6e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 Dec 2011 19:48:33 +0100 Subject: pcm_buffer: eliminate merge conflict fallout --- src/pcm_buffer.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/pcm_buffer.c') 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 -- cgit v1.2.3