mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-25 21:26:40 +00:00
[frontend] fix conflict introduced by merge (#1007)
This commit is contained in:
parent
b4f7316a4c
commit
ad08c6c229
|
@ -31,7 +31,7 @@ const adminActions = require("../redux/reducers/instances").actions;
|
|||
const {
|
||||
TextInput,
|
||||
TextArea,
|
||||
_File
|
||||
File
|
||||
} = require("../components/form-fields").formFields(adminActions.setAdminSettingsVal, (state) => state.instances.adminSettings);
|
||||
|
||||
module.exports = function AdminSettings() {
|
||||
|
|
Loading…
Reference in a new issue