pcm_buffer: eliminate merge conflict fallout

34aab116 · Max Kellermann · 33232fac · 34aab116
Commit 34aab116 authored Dec 13, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

pcm_buffer.c src/pcm_buffer.c +0 -4

No files found.
--- a/src/pcm_buffer.c
+++ b/src/pcm_buffer.c
 /*
-<<<<<<< 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