Fix up more conflicts.
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Tue, 25 Nov 2014 23:47:58 +0000 (00:47 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Tue, 25 Nov 2014 23:47:58 +0000 (00:47 +0100)
commitfb43099dce2e0f62bb663a5f4a316510dc5dc4c7
treee628896170d1800d6d5ea9bfdbd11b9685a0d7c5
parentdd28c44f7f25627039b067c2d4f4b40e6a228ab4
Fix up more conflicts.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
src/lib/raop.c