resolved merge conflict with master. Formatted file.

2017-02-11 14:27:33 -05:00 · 2017-02-11 14:27:33 -05:00 · d4b1a85f79
commit d4b1a85f79
parent 02fede7184
1 changed files with 2 additions and 2 deletions
--- a/schedulers/base.go
+++ b/schedulers/base.go
@ -1,13 +1,13 @@
 package schedulers

 import (
+	"bitbucket.org/sunybingcloud/electron/def"
 	mesos "github.com/mesos/mesos-go/mesosproto"
 	sched "github.com/mesos/mesos-go/scheduler"
 	"log"
-	"bitbucket.org/sunybingcloud/electron/def"
 )

-type base struct{
+type base struct {
 	tasksCreated     int
 	tasksRunning     int
 	tasks            []def.Task