stv0g/comedi-www
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

devices.txt: Removed duplicate entry caused by merge.

Browse source 
I forgot to "git pull" before updating devices.txt locally, so the "git
merge" merged in Bernd's changes to devices.txt from master.  This lead
to a duplicate entry for ITL USB-DUX usbduxsigma.  I'm fixing the dupe
by copying over the devices.txt built from comedi.git again.
This commit is contained in:
Ian Abbott 2012-05-11 10:53:44 +01:00
parent 2c2f62bf45
commit f3128a41f0
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devices.txt
View file

@ -172,7 +172,6 @@ ICP P16R16DIO acl7225b p16r16dio
Inova ICP_MULTI icp_multi icp_multi
Intelligent Instrumentation PCI-20001C ii_pci20kc ii_pci20kc
IOTech DAQBoard/2000 daqboard2000 daqboard2000
ITL USB-DUX usbduxsigma usbduxsigma.o
ITL USB-DUX usbduxfast usbduxfast.o
ITL USB-DUX usbduxsigma usbduxsigma.o
ITL USB-DUX usbdux usbdux.o