fix conflicts

remove modals.tsx as it's no longer used. rename modals.less to settings.less
2026-04-22 15:26:58 -07:00 · 2024-02-02 11:02:24 +08:00 · 2024-02-02 10:55:26 +08:00
3 changed files with 1 additions and 1834 deletions
@@ -26,7 +26,7 @@ import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg"
 import { ReactComponent as GlobeIcon } from "../../assets/icons/globe.svg";
 import { ReactComponent as StatusCircleIcon } from "../../assets/icons/statuscircle.svg";

-import "./modals.less";
+import "./settings.less";

 type OV<V> = mobx.IObservableValue<V>;
Author	SHA1	Message	Date
Red Adaya	7cc22b877c	fix conflicts	2024-02-02 11:02:24 +08:00
Red Adaya	637915554f	remove modals.tsx as it's no longer used. rename modals.less to settings.less	2024-02-02 10:55:26 +08:00