From e6e8335da86c73e6445efdcab94b6666fe295201 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 21 May 2019 18:08:02 +0200
Subject: [PATCH] conflict in last commit fixed

---
 Pmodules/modulecmd.bash.in | 4 ----
 1 file changed, 4 deletions(-)
 mode change 100755 => 100644 Pmodules/modulecmd.bash.in

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
old mode 100755
new mode 100644
index 8b485d8..e2c0132
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -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
 }