[Cvs-cvs] Changes to ccvs/src/subr.c

[Larry Jones]

Index: ccvs/src/subr.c
diff -u ccvs/src/subr.c:1.143 ccvs/src/subr.c:1.144
--- ccvs/src/subr.c:1.143       Thu May 26 17:48:06 2005
+++ ccvs/src/subr.c     Fri Sep  2 21:51:09 2005
@@ -607,11 +607,9 @@
      * conflict any more.
      */
 
-#ifdef SERVER_SUPPORT
     if (server_active)
        retcode = ts_conflict[0] == '=' && ts_conflict[1] == '\0';
     else 
-#endif /* SERVER_SUPPORT */
     {
        filestamp = time_stamp (finfo->file);
        retcode = !strcmp (ts_conflict, filestamp);