fix cvs update reject
This commit is contained in:
parent
375e643a39
commit
45c35318ca
|
@ -115,11 +115,7 @@ static void ph_state_change(dchannel_t *dch);
|
||||||
|
|
||||||
extern const char *CardType[];
|
extern const char *CardType[];
|
||||||
|
|
||||||
<<<<<<< hfc_multi.c
|
|
||||||
static const char *hfcmulti_revision = "$Revision$";
|
static const char *hfcmulti_revision = "$Revision$";
|
||||||
=======
|
|
||||||
static const char *hfcmulti_revision = "$Revision$";
|
|
||||||
>>>>>>> 1.23.2.9
|
|
||||||
|
|
||||||
static int HFC_cnt, HFC_idx;
|
static int HFC_cnt, HFC_idx;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue