Fix merge errors

jig · Nov 21, 2014 · 67e8da6 · 67e8da6
1 parent 4c86c0a
commit 67e8da6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/platforms/firmata/firmata_adaptor.go b/platforms/firmata/firmata_adaptor.go
@@ -66,6 +66,7 @@ func (f *FirmataAdaptor) Connect() (errs []error) {
 	if err := f.connect(f); err != nil {
 		return []error{err}
 	}
+	f.board.connect()
 	f.SetConnected(true)
 	return
 }

diff --git a/platforms/opencv/camera_driver.go b/platforms/opencv/camera_driver.go
@@ -61,7 +61,7 @@ func (c *CameraDriver) Start() (errs []error) {
 			<-time.After(c.Interval())
 		}
 	}()
-	return true
+	return
 }
 
 // Halt stops camera driver
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ func (c *CameraDriver) Start() (errs []error) { @@
     			<-time.After(c.Interval())
     		}
     	}()
-    	return true
+    	return
     }
     // Halt stops camera driver
@@ Expand Down @@