1 changed files with 0 additions and 4 deletions
--- a/errs/code/scope.go
+++ b/errs/code/scope.go
@ -6,8 +6,4 @@ const (
 	CloudEPPortalGW
 	CloudEPMember
 	CloudEPPermission
-<<<<<<< HEAD
-	CloudEPNotification
-=======
->>>>>>> refs/remotes/origin/main
 )