Revert "resolve conflict"

This reverts commit 55db3e7cb3.

bin/buildiso.in

@@ -123,7 +123,7 @@ usage() {
     echo '    -m                 Set SquashFS image mode to persistence'
     echo '    -c                 Disable clean work dir'
     echo '    -f                 Build full ISO (extra=true)'
-    echo '    -d <comp>          Compression used for build ISO: xz, gzip, lzma, lzo, lz4, zstd'
+    echo '    -d <comp>          Compression used for build ISO: xz, gzip, lzma, lzo, lz4'
     echo "                       [default: ${iso_compression}]"
     echo '    -x                 Build images only'
     echo '    -z                 Generate iso only'

data/manjaro-tools.conf

@@ -55,8 +55,9 @@
 # the branding; default: auto
 # dist_branding="MJRO"
 
-# compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4, zstd
-# iso_compression=zstd
+# compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4
+# lz4 is faster but worst compression, may be useful for locally testing isos
+# iso_compression=xz
 
 # unset defaults to given value
 # kernel="linux53"

lib/util-iso.sh

@@ -138,13 +138,8 @@ make_sfs() {
     mksfs_args+=(${sfs} -noappend)
 
     local highcomp="-b 256K -Xbcj x86"
-<<<<<<< HEAD
    
     [[ "${iso_compression}" != "xz" ]] && highcomp=""
-=======
-
-    [[ "${iso_compression}" != "zstd" ]] && highcomp=""
->>>>>>> af495a6... iso_compression default to zstd
 
     if [[ "${name}" == "mhwdfs" && ${used_kernel} < "4" ]]; then
         mksfs_args+=(-comp lz4)

lib/util.sh

@@ -311,7 +311,7 @@ init_buildiso(){
 
     [[ -z ${dist_branding} ]] && dist_branding="MJRO"
 
-    [[ -z ${iso_compression} ]] && iso_compression='zstd'
+    [[ -z ${iso_compression} ]] && iso_compression='xz'
 
     iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")