1 files changed, 0 insertions, 1 deletions

diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1
index 025e68130eb1..f2b74ea83bd8 100644
--- a/crypto/openssh/ssh.1
+++ b/crypto/openssh/ssh.1
@@ -810,7 +810,6 @@ real host name when looking up or saving the host key
 in the host key database files.
 This option is useful for tunneling ssh connections
 or if you have multiple servers running on a single host.
->>>>>>> 1.1.1.7
 .It Cm HostName
 Specifies the real host name to log into.
 This can be used to specify nicknames or abbreviations for hosts.