summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-11 09:55:26 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-11 09:55:26 +0000
commit81c205f98758befd4ecfbe963533ab91a680ef33 (patch)
treefbf6d45a0473bc4ce2fbb0543eab9defc1f616de /sys/arch
parentdf81f9ea46ea54884040e1e247615c46a6877d02 (diff)
pefo look at this diff closely
Diffstat (limited to 'sys/arch')
-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: