summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/version.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2004-10-28 16:11:31 +0000
committerdes <des@FreeBSD.org>2004-10-28 16:11:31 +0000
commita744ec13ade7d70128cd82393862d02c1f712f6a (patch)
tree2b93d7eeb78a97c2cc9e93d61346f39150ed165f /crypto/openssh/version.c
parentca12ec184bb7b4d1d0ff5dc213f5da06de091b8c (diff)
downloadFreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.zip
FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.tar.gz
Resolve conflicts
Diffstat (limited to 'crypto/openssh/version.c')
-rw-r--r--crypto/openssh/version.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/openssh/version.c b/crypto/openssh/version.c
index a661439..cf2ad86 100644
--- a/crypto/openssh/version.c
+++ b/crypto/openssh/version.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
#include "includes.h"
OpenPOWER on IntegriCloud