Jelajahi Sumber

fix conflict

AjayTripathy 6 tahun lalu
induk
melakukan
89680fe01e
1 mengubah file dengan 0 tambahan dan 3 penghapusan
  1. 0 3
      main.go

+ 0 - 3
main.go

@@ -762,11 +762,8 @@ func main() {
 	prometheus.MustRegister(RAMAllocation)
 	prometheus.MustRegister(CPUAllocation)
 	prometheus.MustRegister(ContainerUptimeRecorder)
-<<<<<<< HEAD
 	prometheus.MustRegister(PVAllocation)
-=======
 	prometheus.MustRegister(NetworkZoneEgressRecorder, NetworkRegionEgressRecorder, NetworkInternetEgressRecorder)
->>>>>>> 82ec229e122566565cb40a9930c7500ba5b59b1c
 	prometheus.MustRegister(costModel.ServiceCollector{
 		KubeClientSet: kubeClientset,
 	})