mirror of
https://gitlab.com/CinnamonSlackBuilds/csb.git
synced 2024-12-26 21:59:28 +01:00
muffin: Fix rebase issue.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
parent
7b8a453278
commit
fbf1b4dda4
1 changed files with 0 additions and 3 deletions
|
@ -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" \
|
||||
|
|
Loading…
Reference in a new issue