resolve conflicts

juspay · Jan 22, 2024 · a4a600a · a4a600a
1 parent 54e3678
commit a4a600a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/crates/api_models/src/events/user_role.rs b/crates/api_models/src/events/user_role.rs
@@ -1,8 +1,8 @@
 use common_utils::events::{ApiEventMetric, ApiEventsType};
 
 use crate::user_role::{
-    AcceptInvitationRequest, AuthorizationInfoResponse, DeleteUserRoleRequest, GetRoleRequest, ListRolesResponse,
-    RoleInfoResponse, UpdateUserRoleRequest,
+    AcceptInvitationRequest, AuthorizationInfoResponse, DeleteUserRoleRequest, GetRoleRequest,
+    ListRolesResponse, RoleInfoResponse, UpdateUserRoleRequest,
 };
 
 common_utils::impl_misc_api_event_type!(

diff --git a/crates/router/src/core/user_role.rs b/crates/router/src/core/user_role.rs
@@ -1,8 +1,8 @@
 use api_models::user_role as user_role_api;
 use diesel_models::{enums::UserStatus, user_role::UserRoleUpdate};
 use error_stack::ResultExt;
-use router_env::logger;
 use masking::ExposeInterface;
+use router_env::logger;
 
 use crate::{
     core::errors::{UserErrors, UserResponse},

diff --git a/crates/router/src/utils/user.rs b/crates/router/src/utils/user.rs
@@ -4,7 +4,6 @@ use error_stack::ResultExt;
 use masking::Secret;
 
 use crate::{
-    consts,
     core::errors::{UserErrors, UserResult},
     routes::AppState,
     services::authentication::{AuthToken, UserFromToken},