From d4b1a85f79ab4611a4e7a5ab1617ff65e0ba7eab Mon Sep 17 00:00:00 2001 From: Pradyumna Kaushik Date: Sat, 11 Feb 2017 14:27:33 -0500 Subject: [PATCH] resolved merge conflict with master. Formatted file. --- schedulers/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schedulers/base.go b/schedulers/base.go index dfc0beb..099559e 100644 --- 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