summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2004-08-11 09:55:25 +0000
committerderaadt <deraadt@openbsd.org>2004-08-11 09:55:25 +0000
commit715a9ef0c2bd446a5d83df2fa151c52f4e50fcf8 (patch)
treef89cf8c29aaa43214fa379139c98fa5bd6862b92
parentmips -> mips64; pefo ok (diff)
downloadwireguard-openbsd-715a9ef0c2bd446a5d83df2fa151c52f4e50fcf8.tar.xz
wireguard-openbsd-715a9ef0c2bd446a5d83df2fa151c52f4e50fcf8.zip
pefo look at this diff closely
-rw-r--r--sys/arch/sgi/include/exec.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/arch/sgi/include/exec.h b/sys/arch/sgi/include/exec.h
index ece4c9510db..6be412fe67d 100644
--- a/sys/arch/sgi/include/exec.h
+++ b/sys/arch/sgi/include/exec.h
@@ -1,13 +1,8 @@
-/* $OpenBSD: exec.h,v 1.4 2004/08/10 20:34:59 pefo Exp $ */
+/* $OpenBSD: exec.h,v 1.5 2004/08/11 09:55:25 deraadt Exp $ */
/*
-<<<<<<< exec.h
* Copyright (c) 1996-2004 Per Fogelstrom, Opsycon AB
*
-=======
- * Copyright (c) 1996-2003 Per Fogelstrom
- *
->>>>>>> 1.3
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met: