Fix Rebasing Error

Author: mbaijal

pkg/generate/config/resource.go

@@ -276,6 +276,8 @@ type PrintConfig struct {
 	AddAgeColumn bool `json:"add_age_column"`
 	// OrderBy is the field used to sort the list of PrinterColumn options.
 	OrderBy string `json:"order_by"`
+}
+
 // ReconcileConfig describes options for controlling the reconciliation
 // logic for a particular resource.
 type ReconcileConfig struct {

pkg/model/crd.go

@@ -554,6 +554,7 @@ func (r *CRD) GetResourcePrintOrderByName() string {
 // kubebuilder:printcolumn comment marker
 func (r *CRD) PrintAgeColumn() bool {
 	return r.cfg.GetResourcePrintAddAgeColumn(r.Names.Camel)
+}
 
 // ReconcileRequeuOnSuccessSeconds returns the duration after which to requeue
 // the custom resource as int, if specified in generator config.