From 6b44bde9c993b2c4128d65e1fc4fa8e1dd68f3d7 Mon Sep 17 00:00:00 2001
From: Ashley <tuyethantt@gmail.com>
Date: Tue, 14 Jan 2025 22:51:39 +0700
Subject: [PATCH] Resolved conflicts

---
 .../Settings/Advanced/FactoryReset/ModalConfirmReset.tsx  | 6 +++---
 web/screens/Settings/Advanced/FactoryReset/index.tsx      | 6 +++---
 web/screens/Settings/Advanced/index.tsx                   | 8 +++++---
 web/screens/Settings/Engines/LocalEngineSettings.tsx      | 3 ++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
index 20749a60f..c59163735 100644
--- a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
@@ -30,9 +30,9 @@ const ModalConfirmReset = () => {
       content={
         <div>
           <p className="text-[hsla(var(--text-secondary))]">
-            Restore appplication to its initial state, erasing all models and chat history.
-            This action is irreversible and recommended only if the application
-            is corrupted.
+            Restore appplication to its initial state, erasing all models and
+            chat history. This action is irreversible and recommended only if
+            the application is corrupted.
           </p>
 
           <div className="my-4">
diff --git a/web/screens/Settings/Advanced/FactoryReset/index.tsx b/web/screens/Settings/Advanced/FactoryReset/index.tsx
index 3f85be34d..f688e0a61 100644
--- a/web/screens/Settings/Advanced/FactoryReset/index.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/index.tsx
@@ -17,9 +17,9 @@ const FactoryReset = () => {
           </h6>
         </div>
         <p className="whitespace-pre-wrap font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-          Restore appplication to its initial state, erasing all models and chat history.
-          This action is irreversible and recommended only if the application is
-          corrupted.
+          Restore appplication to its initial state, erasing all models and chat
+          history. This action is irreversible and recommended only if the
+          application is corrupted.
         </p>
       </div>
       <Button
diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx
index 9723f87e2..9b6fcf83d 100644
--- a/web/screens/Settings/Advanced/index.tsx
+++ b/web/screens/Settings/Advanced/index.tsx
@@ -232,7 +232,8 @@ const Advanced = () => {
               <h6 className="font-semibold capitalize">Experimental Mode</h6>
             </div>
             <p className="font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-            New features that are still unstable and could affect app performance. Enable with caution.
+              New features that are still unstable and could affect app
+              performance. Enable with caution.
             </p>
           </div>
           <Switch
@@ -446,7 +447,8 @@ const Advanced = () => {
               <h6 className="font-semibold capitalize">HTTPS Proxy</h6>
             </div>
             <p className="font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-              Optional proxy server for internet connections. Only HTTPS proxies supported.
+              Optional proxy server for internet connections. Only HTTPS proxies
+              supported.
             </p>
           </div>
 
@@ -500,7 +502,7 @@ const Advanced = () => {
                 <h6 className="font-semibold capitalize">Jan Quick Ask</h6>
               </div>
               <p className="font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-                Enable Quick Ask to be triggered via the default hotkey {' '}.
+                Enable Quick Ask to be triggered via the default hotkey .
                 <span className="text-[hsla(var(--text-secondary)] bg-secondary inline-flex items-center justify-center rounded-full px-1 py-0.5 text-xs font-bold">
                   <span className="font-bold">{isMac ? '⌘' : 'Ctrl'} + J</span>
                 </span>{' '}
diff --git a/web/screens/Settings/Engines/LocalEngineSettings.tsx b/web/screens/Settings/Engines/LocalEngineSettings.tsx
index cac731a85..c9522a743 100644
--- a/web/screens/Settings/Engines/LocalEngineSettings.tsx
+++ b/web/screens/Settings/Engines/LocalEngineSettings.tsx
@@ -215,7 +215,8 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => {
                   <div className="mt-2 w-full font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
                     <p>
                       Choose the default variant that best suited for your
-                      hardware. See [our guides](https://jan.ai/docs/local-engines/llama-cpp).
+                      hardware. See [our
+                      guides](https://jan.ai/docs/local-engines/llama-cpp).
                     </p>
                   </div>
                 </div>