mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-11-20 04:34:05 +01:00
conflict in last commit fixed
This commit is contained in:
1 parent
4a8c9498e7
commit
e6e8335da8
1 file changed
-4
Executable → Regular
-4
@@ -944,12 +944,8 @@ subcommand_avail() {
|
||||
"${string}" \
|
||||
"${opt_use_releases}" ) )
|
||||
[[ ${#mods[@]} == 0 ]] && continue
|
||||
<<<<<<< HEAD
|
||||
|
||||
${output_function} "${group}"
|
||||
=======
|
||||
${output_function}
|
||||
>>>>>>> 38-implement-generic-print-help-function
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user