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

[Derek Robert Price]

Index: ccvs/src/subr.h
diff -u ccvs/src/subr.h:1.6 ccvs/src/subr.h:1.7
--- ccvs/src/subr.h:1.6 Sun Sep  4 23:00:04 2005
+++ ccvs/src/subr.h     Fri Sep 23 03:19:24 2005
@@ -33,7 +33,6 @@
 char *gca (const char *rev1, const char *rev2);
 void check_numeric (const char *, int, char **);
 char *make_message_rcsvalid (const char *message);
-int file_has_conflict (const struct file_info *, const char *ts_conflict);
 int file_has_markers (const struct file_info *);
 void get_file (const char *, const char *, const char *,
                char **, size_t *, size_t *);