fix merge conflict

grafana · Jul 28, 2020 · 7e14254 · 7e14254
1 parent 03dce89
commit 7e14254
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go
@@ -370,8 +370,8 @@ func activePeriodConfig(cfg chunk.SchemaConfig) int {
 // usingBoltdbShipper check whether current or the next index type is boltdb-shipper, returns true if yes.
 func usingBoltdbShipper(cfg chunk.SchemaConfig) bool {
 	activePCIndex := activePeriodConfig(cfg)
-	if cfg.Configs[activePCIndex].IndexType == local.BoltDBShipperType ||
-		(len(cfg.Configs)-1 > activePCIndex && cfg.Configs[activePCIndex+1].IndexType == local.BoltDBShipperType) {
+	if cfg.Configs[activePCIndex].IndexType == shipper.BoltDBShipperType ||
+		(len(cfg.Configs)-1 > activePCIndex && cfg.Configs[activePCIndex+1].IndexType == shipper.BoltDBShipperType) {
 		return true
 	}