Fix merge in icom.h

pull/252/head
Michael Black W9MDB 2020-05-11 22:44:33 -05:00
rodzic 2813f0ef63
commit 366c60020b
1 zmienionych plików z 0 dodań i 4 usunięć

Wyświetl plik

@ -31,11 +31,7 @@
#include <sys/time.h>
#endif
<<<<<<< HEAD
#define BACKEND_VER "20200510"
=======
#define BACKEND_VER "20200511"
>>>>>>> 3b2225e4891cf4420814b19c214b8c64e174539d
/*
* defines used by comp_cal_str in rig.c