resolve merge conflict

nirmata · Jul 9, 2019 · 7490217 · 7490217
1 parent 42b8bcc
commit 7490217
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/event/controller.go b/pkg/event/controller.go
@@ -141,7 +141,7 @@ func (c *controller) SyncHandler(key Info) error {
 	default:
 		robj, err = c.client.GetResource(key.Kind, key.Namespace, key.Name)
 		if err != nil {
-			glog.Errorf("Error creating event: unable to get resource %s, %s, will retry ", resource, key.Namespace+"/"+key.Name)
+			glog.Errorf("Error creating event: unable to get resource %s, %s, will retry ", key.Kind, key.Namespace+"/"+key.Name)
 			return err
 		}
 	}