From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/autossh/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/autossh') diff --git a/package/autossh/Makefile b/package/autossh/Makefile index 526f4442f..f9b1df527 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= autossh PKG_VERSION:= 1.4b PKG_RELEASE:= 1 PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7 -PKG_DESCR:= Automatically restart SSH sessions and tunnels +PKG_DESCR:= automatically restart ssh sessions and tunnels PKG_SECTION:= net/security PKG_DEPENDS:= openssh-client PKG_URL:= http://www.harding.motd.ca/autossh/ -- cgit v1.2.3