Conflict resolved -- mm

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index c6bcace7c1ac1432524901d3442ef8750399cbad..406ccc92fe03405972fc73af30799214828517fd 100644 (file)
--- 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));
                                }