fix conflict

kartikaysaxena · kartikaysaxena · commit ead2bdab9403 · 2025-07-20T22:07:29.000+05:30
Signed-off-by: Kartikay &lt;kartikay_2101ce32@iitp.ac.in&gt;
diff --git a/e2e/go.mod b/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
-)
+)
diff --git a/pkg/schemadsl/compiler/translator.go b/pkg/schemadsl/compiler/translator.go
@@ -509,7 +509,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")

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,6 @@ func translatePermission(tctx translationContext, permissionNode dslNode) (*co`
`509`	`509`	`return permission, nil`
`510`	`510`	`}`
`511`	`511`
`512`		`-`
`513`	`512`	`func translateDeprecation(tctx translationContext, depNode dslNode) (*core.Deprecation, error) {`
`514`	`513`	`if !slices.Contains(tctx.allowedFlags, "deprecation") \|\| !slices.Contains(tctx.enabledFlags, "deprecation") {`
`515`	`514`	`return nil, depNode.Errorf("deprecation not enabled")`