Fixed an unresolved merge conflict

dimkr · Dec 6, 2017 · ee67198 · ee67198
1 parent eae2a6c
commit ee67198
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/ksh.1 b/ksh.1
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-.\"	$OpenBSD: ksh.1,v 1.187 2017/02/19 22:09:18 schwarze Exp $
-.\"
-.\"	Public Domain
-.\"
-.Dd $Mdocdate: February 19 2017 $
-=======
 .\"	$OpenBSD: ksh.1,v 1.195 2017/08/30 17:08:45 jca Exp $
 .\"
 .\"	Public Domain
 .\"
 .Dd $Mdocdate: August 30 2017 $
->>>>>>> upstream/6.2
 .Dt KSH 1
 .Os
 .Sh NAME