[src/netbsd-1-4]: src/sys/arch/arm32/arm32 Fix conflicts introduced by a stra...

[pk <pk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ae5d3151501b
branches:  netbsd-1-4
changeset: 468190:ae5d3151501b
user:      pk <pk%NetBSD.org@localhost>
date:      Mon Apr 12 21:31:33 1999 +0000

description:
Fix conflicts introduced by a stray cvs merge op.

diffstat:

 sys/arch/arm32/arm32/db_interface.c |  10 +---------
 sys/arch/arm32/arm32/db_trace.c     |  10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diffs (50 lines):

diff -r ca5584c0261e -r ae5d3151501b sys/arch/arm32/arm32/db_interface.c
--- a/sys/arch/arm32/arm32/db_interface.c       Mon Apr 12 21:27:03 1999 +0000
+++ b/sys/arch/arm32/arm32/db_interface.c       Mon Apr 12 21:31:33 1999 +0000
@@ -1,8 +1,4 @@
-<<<<<<< db_interface.c
-/*     $NetBSD: db_interface.c,v 1.26.2.2 1999/04/12 21:27:04 pk Exp $ */
-=======
-/*     $NetBSD: db_interface.c,v 1.26.2.2 1999/04/12 21:27:04 pk Exp $ */
->>>>>>> 1.28
+/*     $NetBSD: db_interface.c,v 1.26.2.3 1999/04/12 21:32:47 pk Exp $ */
 
 /* 
  * Copyright (c) 1996 Scott K. Stevens
@@ -17,11 +13,7 @@
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * 
-<<<<<<< db_interface.c
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-=======
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
->>>>>>> 1.28
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * 
diff -r ca5584c0261e -r ae5d3151501b sys/arch/arm32/arm32/db_trace.c
--- a/sys/arch/arm32/arm32/db_trace.c   Mon Apr 12 21:27:03 1999 +0000
+++ b/sys/arch/arm32/arm32/db_trace.c   Mon Apr 12 21:31:33 1999 +0000
@@ -1,8 +1,4 @@
-<<<<<<< db_trace.c
-/*     $NetBSD: db_trace.c,v 1.9.2.2 1999/04/12 21:27:04 pk Exp $      */
-=======
-/*     $NetBSD: db_trace.c,v 1.9.2.2 1999/04/12 21:27:04 pk Exp $      */
->>>>>>> 1.11
+/*     $NetBSD: db_trace.c,v 1.9.2.3 1999/04/12 21:31:33 pk Exp $      */
 
 /* 
  * Copyright (c) 1996 Scott K. Stevens
@@ -17,11 +13,7 @@
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * 
-<<<<<<< db_trace.c
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-=======
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
->>>>>>> 1.11
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  *