spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

resolved merge conflict with master. Formatted file.

Browse source
This commit is contained in:
Pradyumna Kaushik 2017-02-11 14:27:33 -05:00
parent 02fede7184
commit d4b1a85f79
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
schedulers/base.go
View file

@ -1,10 +1,10 @@
package schedulers package schedulers
import ( import (
"bitbucket.org/sunybingcloud/electron/def"
mesos "github.com/mesos/mesos-go/mesosproto" mesos "github.com/mesos/mesos-go/mesosproto"
sched "github.com/mesos/mesos-go/scheduler" sched "github.com/mesos/mesos-go/scheduler"
"log" "log"
"bitbucket.org/sunybingcloud/electron/def"
) )
type base struct { type base struct {