fix rebasing error

Signed-off-by: longfangsong <longfangsong@icloud.com>
tikv · Nov 30, 2020 · 458c4d8 · 458c4d8
1 parent 5f24ab7
commit 458c4d8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/server/config/persist_options.go b/server/config/persist_options.go
@@ -30,14 +30,10 @@ import (
 	"github.com/tikv/pd/pkg/slice"
 	"github.com/tikv/pd/pkg/typeutil"
 	"github.com/tikv/pd/server/core"
-<<<<<<< HEAD
 	"github.com/tikv/pd/server/kv"
 	"github.com/tikv/pd/server/schedule"
 	"github.com/tikv/pd/server/schedule/storelimit"
-=======
-	"github.com/tikv/pd/server/core/storelimit"
 	"go.etcd.io/etcd/clientv3"
->>>>>>> 1eeb4c87... Persist temporary setting to etcd  (#3131)
 )
 
 // PersistOptions wraps all configurations that need to persist to storage and