Index: generic/predefined.h
===================================================================
diff -u -N -rb69a6989827fe4b926f24d42f4dee151974e5b9a -ra6ad6a2890ddf47d82f3624eae90075400d8804b
--- generic/predefined.h	(.../predefined.h)	(revision b69a6989827fe4b926f24d42f4dee151974e5b9a)
+++ generic/predefined.h	(.../predefined.h)	(revision a6ad6a2890ddf47d82f3624eae90075400d8804b)
@@ -66,11 +66,9 @@
 "nsf::log Debug \"call($level) - $objectInfo $methodInfo $arglist\"}\n"
 "proc ::nsf::debug::exit {level objectInfo methodInfo result usec} {\n"
 "nsf::log Debug \"exit($level) - $objectInfo $methodInfo $usec usec -> $result\"}\n"
->>>>>>> master
 "proc ::nsf::deprecated {what oldCmd newCmd} {\n"
 "set msg \"*** $what $oldCmd is deprecated.\"\n"
 "if {$newCmd ne \"\"} {append msg \" use $newCmd instead.\"}\n"
-"puts stderr HERE\n"
 "nsf::log Warning $msg}\n"
 "proc tmpdir {} {\n"
 "foreach e [list TMPDIR TEMP TMP] {\n"