[X2Go-Commits] [maintenancescripts] 01/02: git/hooks: delete update-merge symlink, won't work with git hooks.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository maintenancescripts.

commit 5adcca23851ca1f2adce1f2d65bcfc2c32fa25c8
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 24 00:14:32 2015 +0100

    git/hooks: delete update-merge symlink, won't work with git hooks.
---
 git/hooks/update-merge |    1 -
 1 file changed, 1 deletion(-)

diff --git a/git/hooks/update-merge b/git/hooks/update-merge
deleted file mode 120000
index 77c430a..0000000
--- a/git/hooks/update-merge
+++ /dev/null
@@ -1 +0,0 @@
-update
\ No newline at end of file

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git