UPSTREAM: <drop>: manually resolve conflict

Fix conflicting import statements from commit ad91dd2

Signed-off-by: Thomas Jungblut <[email protected]>

Author: tjungblu

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete_test.go

@@ -31,12 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-<<<<<<< HEAD
-	auditapis "k8s.io/apiserver/pkg/apis/audit"
-=======
-	"k8s.io/apiserver/pkg/admission"
 	auditinternal "k8s.io/apiserver/pkg/apis/audit"
->>>>>>> ad91dd2caa0 (UPSTREAM: 131694: Eliminate AuditContext`s SetEventLevel)
 	"k8s.io/apiserver/pkg/audit"
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/registry/rest"