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