resolved merge conflict with master. Formatted file.

This commit is contained in:
Pradyumna Kaushik 2017-02-11 14:27:33 -05:00
parent 02fede7184
commit d4b1a85f79

View file

@ -1,10 +1,10 @@
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 {