qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-25 21:26:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[frontend] fix conflict introduced by merge (#1007)

Browse source
This commit is contained in:
f0x52 2022-11-08 20:50:37 +01:00 committed by GitHub
parent b4f7316a4c
commit ad08c6c229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/source/settings/admin/settings.js
View file

@ -31,7 +31,7 @@ const adminActions = require("../redux/reducers/instances").actions;
const { const {
TextInput, TextInput,
TextArea, TextArea,
_File File
} = require("../components/form-fields").formFields(adminActions.setAdminSettingsVal, (state) => state.instances.adminSettings); } = require("../components/form-fields").formFields(adminActions.setAdminSettingsVal, (state) => state.instances.adminSettings);
module.exports = function AdminSettings() { module.exports = function AdminSettings() {