- removed bogus lines.

Changed files:
    audiofile.spec -> 1.15

diff --git a/audiofile.spec b/audiofile.spec
index b70caf519331c19d5c2362a19ed9c71d146d3b99..bf4bbc65a65170079c0a3f8014b52c1cde86caa6 100644 (file)
--- a/audiofile.spec
+++ b/audiofile.spec
@@ -62,13 +62,8 @@ Biblioteki statyczne libaudiofile.
 %build
 autoconf
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-<<<<<<< audiofile.spec
-./configure %{_target_platform} \
-       --prefix=/usr
-=======
 ./configure %{_target_platform} \
        --prefix=%{_prefix}
->>>>>>> 1.13
 make
 
 %install