This commit fixes the rebased code

Signed-off-by: mittachaitu <sai.chaithanya@mayadata.io>
openebs-archive · May 20, 2020 · 50f503c · 50f503c
1 parent 812aa92
commit 50f503c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/pkg/controllers/cspi-controller/handler.go b/pkg/controllers/cspi-controller/handler.go
@@ -446,7 +446,6 @@ func (c *CStorPoolInstanceController) addDiskUnavailableCondition(cspi *cstor.CS
 	}
 }
 
-<<<<<<< HEAD
 func (c *CStorPoolInstanceController) reconcileVersion(cspi *cstor.CStorPoolInstance) (*cstor.CStorPoolInstance, error) {
 	var err error
 	// the below code uses deep copy to have the state of object just before