muffin: Fix rebase issue.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2019-11-24 18:31:36 +07:00
parent 7b8a453278
commit fbf1b4dda4
No known key found for this signature in database
GPG key ID: 887B8374D7333381

View file

@ -71,11 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
<<<<<<< HEAD
sed -i "s|--warn-error||g" src/Makefile.am
=======
patch -p1 < $CWD/0001-fix-warnings-when-compiling.patch
>>>>>>> muffin: Build fix.
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \