fix conflict

2016-02-28 20:54:48 -06:00 · 2016-02-28 20:54:48 -06:00 · 3716f4e845
commit 3716f4e845
--- a/main/sdr.go
+++ b/main/sdr.go
@ -40,7 +40,6 @@ type ES Device
 var UATDev *UAT
 var ESDev *ES

-
 func (e *ES) read() {
 	defer e.wg.Done()
 	log.Println("Entered ES read() ...")