Index: /trunk/platforms/tsar_generic_xbar/top.cpp
===================================================================
--- /trunk/platforms/tsar_generic_xbar/top.cpp	(revision 396)
+++ /trunk/platforms/tsar_generic_xbar/top.cpp	(revision 397)
@@ -569,5 +569,4 @@
             {
 #endif
-            bool is_io_cluster = (cluster(x,y) == cluster_io_id);
 
             std::ostringstream sc;
@@ -579,5 +578,4 @@
             (
                 sc.str().c_str(),
-<<<<<<< .mine
                 NB_PROCS_MAX,
                 NB_TTY_CHANNELS,