Merge branch 'int' into feat/auxiliaries2
This commit is contained in:
commit
cbb1614594
1 changed files with 4 additions and 0 deletions
|
|
@ -11,7 +11,11 @@ export const TeamsbotSettingsView: React.FC = () => {
|
||||||
const { instance } = useCurrentInstance();
|
const { instance } = useCurrentInstance();
|
||||||
const instanceId = instance?.id || '';
|
const instanceId = instance?.id || '';
|
||||||
|
|
||||||
|
<<<<<<< feat/auxiliaries2
|
||||||
const [_config, setConfig] = useState<TeamsbotConfig | null>(null);
|
const [_config, setConfig] = useState<TeamsbotConfig | null>(null);
|
||||||
|
=======
|
||||||
|
const [, setConfig] = useState<TeamsbotConfig | null>(null);
|
||||||
|
>>>>>>> int
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue