From a9f3bca8d03b5fa5a0870340d93dda46f7666b49 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 1 Nov 2024 13:21:30 -0500
Subject: [PATCH] resolve conflict

---
 .../BotSharp.OpenAPI/Controllers/UserController.cs          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs
index 2521fff6..90bf20f1 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs
@@ -13,13 +13,13 @@ public class UserController : ControllerBase
     private readonly IServiceProvider _services;
     private readonly IUserService _userService;
     private readonly IUserIdentity _user;
+    private readonly AccountSetting _setting;
 
     public UserController(
         IUserService userService,
         IServiceProvider services,
-        IUserIdentity user)
-    private readonly AccountSetting _setting;
-    public UserController(IUserService userService, IServiceProvider services, AccountSetting setting)
+        IUserIdentity user,
+        AccountSetting setting)
     {
         _services = services;
         _userService = userService;