From: hadaq <hadaq>
Date: Thu, 24 Oct 2002 09:15:18 +0000 (+0000)
Subject: Conflict resolved -- mm
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0a88c4538153b042cbaa9dd4b0a4b3c24986e9b4;p=daqdata.git

Conflict resolved -- mm
---

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index c6bcace..406ccc9 100644
--- a/hadaq/hwshow.c
+++ b/hadaq/hwshow.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.27 2002-10-24 08:25:35 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.28 2002-10-24 09:15:18 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -155,7 +155,7 @@ void Hardware_readout(Hardware *my, void *partEvt)
 			} else {
 				if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
 					SubEvt_setDataError(subEvt);
-						SubEvt_setDataError(partEvt);
+					SubEvt_setDataError(partEvt);
 					syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x",
 						   my->ship[i]->name, trigTag, firstShip, SubEvt_trigNr(subEvt));
 				}