:missed changes to auth.c

2018-04-02 13:15:17 -07:00 · 2018-04-02 13:15:17 -07:00 · 6c9f57ac09
parent 2474b9130b
commit 6c9f57ac09
1 changed files with 1 additions and 4 deletions
--- 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;