[Cvs-cvs] Changes to ccvs/src/cvs.h [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/cvs.h
diff -u ccvs/src/cvs.h:1.235.4.34 ccvs/src/cvs.h:1.235.4.35
--- ccvs/src/cvs.h:1.235.4.34   Mon Jun  6 21:32:50 2005
+++ ccvs/src/cvs.h      Thu Sep 22 18:13:26 2005
@@ -679,8 +679,6 @@
 void read_cvsrc PROTO((int *argc, char ***argv, const char *cmdname));
 
 char *make_message_rcslegal PROTO((const char *message));
-extern int file_has_conflict PROTO ((const struct file_info *,
-                                    const char *ts_conflict));
 extern int file_has_markers PROTO ((const struct file_info *));
 extern void get_file PROTO ((const char *, const char *, const char *,
                             char **, size_t *, size_t *));