resolved conflicts

1 files changed, 5 insertions, 0 deletions

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index ff0b22381..0e15197c4 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -8,6 +8,8 @@ import { SelectionManager } from "./SelectionManager";
 import "./SettingsManager.scss";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Networking } from "../Network";
+import { CurrentUserUtils } from "./CurrentUserUtils";
+import { Utils } from "../../Utils";
 
 library.add(fa.faWindowClose);
 
@@ -90,6 +92,9 @@ export default class SettingsManager extends React.Component<{}> {
                     <div className="settings-type">
                         <button onClick={this.onClick} value="password">reset password</button>
                         <button onClick={this.onClick} value="data">reset data</button>
+                        <button onClick={() => window.location.assign(Utils.prepend("/logout"))}>
+                            {CurrentUserUtils.GuestWorkspace ? "Exit" : "Log Out"}
+                        </button>
                     </div>
                     {this.settingsContent === "password" ?
                         <div className="settings-content">