Index: generic/nsf.tcl
===================================================================
diff -u -r4befd49a711512427661098a7de2957992a09cfd -rb69a6989827fe4b926f24d42f4dee151974e5b9a
--- generic/nsf.tcl	(.../nsf.tcl)	(revision 4befd49a711512427661098a7de2957992a09cfd)
+++ generic/nsf.tcl	(.../nsf.tcl)	(revision b69a6989827fe4b926f24d42f4dee151974e5b9a)
@@ -165,6 +165,7 @@
   }
   proc ::nsf::debug::exit {level objectInfo methodInfo result usec} {
     nsf::log Debug "exit($level) - $objectInfo $methodInfo $usec usec -> $result"
+>>>>>>> master
   }
 
   #