fix conflict

Signed-off-by: Kartikay <kartikay_2101ce32@iitp.ac.in>

Author: kartikaysaxena

e2e/go.mod

@@ -82,4 +82,4 @@ require (
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/controller-runtime v0.21.0 // indirect
-)
+)

internal/services/v1/relationships.go

@@ -658,7 +658,6 @@ func checkForDeprecatedRelationsAndObjects(ctx context.Context, update *v1.Relat
 		case corev1.DeprecationType_DEPRECATED_TYPE_ERROR:
 			return shared.NewDeprecationError(update.Relationship.Resource.ObjectType, update.Relationship.Relation, relDef.Deprecation.Comments)
 		}
-
 	}
 	nsdef, _, err := reader.ReadNamespaceByName(ctx, resource.ObjectType)
 	if err != nil {

pkg/schemadsl/compiler/translator.go

@@ -305,7 +305,6 @@ func translateObjectDefinition(tctx *translationContext, defNode *dslNode) (*cor
 }
 
 func deprecateRelationsAndObjects(deprecations []*core.Deprecation, namespaces []*core.NamespaceDefinition) error {
-
 	objectMap := make(map[string]*core.NamespaceDefinition)
 	relationMap := make(map[string]*core.Relation)
 
@@ -509,7 +508,6 @@ func translatePermission(tctx *translationContext, permissionNode *dslNode) (*co
 	return permission, nil
 }
 
-
 func translateDeprecation(tctx *translationContext, depNode *dslNode) (*core.Deprecation, error) {
 	if !slices.Contains(tctx.allowedFlags, "deprecation") || !slices.Contains(tctx.enabledFlags, "deprecation") {
 		return nil, depNode.Errorf("deprecation not enabled")