From 6c9f57ac097827abfb9c89503bdcc0aea917cb5d Mon Sep 17 00:00:00 2001 From: Manoj Ampalam Date: Mon, 2 Apr 2018 13:15:17 -0700 Subject: [PATCH] :missed changes to auth.c --- auth.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/auth.c b/auth.c index 2c7316b15..da903c3a2 100644 --- a/auth.c +++ b/auth.c @@ -74,11 +74,8 @@ #include "authfile.h" #include "ssherr.h" #include "compat.h" -<<<<<<< HEAD -#include "sshfileperm.h" -======= #include "channels.h" ->>>>>>> 2c71ca1dd1efe458cb7dee3f8a1a566f913182c2 +#include "sshfileperm.h" /* import */ extern ServerOptions options;