Mon Jul 20 08:20:04 2015 UTC ()

Fix mismerge.


(wiz)

diff -r1.5 -r1.6 xsrc/external/mit/xman/dist/handler.c

--- xsrc/external/mit/xman/dist/handler.c 2015/07/19 23:04:04	1.5

+++ xsrc/external/mit/xman/dist/handler.c 2015/07/20 08:20:04	1.6

@@ -320,7 +320,7 @@
  * If we are not active then take no action.
  */
 
-    if (man_globals->tempfile == NULL || man_globals->tempfile[0] == '\0')
+    if (man_globals->tempfile[0] == '\0')
         return;
 
     switch (params[0][0]) {