retronetworking
/
mISDN
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix cvs update reject

This commit is contained in:
Karsten Keil 2005-10-20 14:56:09 +00:00
parent 375e643a39
commit 45c35318ca
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/isdn/hardware/mISDN/hfc_multi.c
View File

@ -115,11 +115,7 @@ static void ph_state_change(dchannel_t *dch);
extern const char *CardType[];
<<<<<<< hfc_multi.c
static const char *hfcmulti_revision = "$Revision$";
=======
static const char *hfcmulti_revision = "$Revision$";
>>>>>>> 1.23.2.9
static int HFC_cnt, HFC_idx;