From e4f6a43d63372d9ddc21574d5fc43aea01c9c117 Mon Sep 17 00:00:00 2001
From: Ian Nartowicz <iann@crunchbang>
Date: Tue, 10 Jun 2014 16:40:52 +0100
Subject: ogg_stream_flush_fill conditional compilation

---
 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 57d87e90..6005ff51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -753,10 +753,7 @@ PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/last
 AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_OGG, test "x$HAVE_OGG" = "xyes")
-<<<<<<< HEAD
-=======
 AM_CONDITIONAL(HAVE_OGG_STREAM_FLUSH_FILL, test "x$HAVE_OGG_STREAM_FLUSH_FILL" = "xyes")
->>>>>>> Possible conditional compilation for padding
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
-- 
cgit v1.2.3