commit ad08c6c22987d31d9ead0429aae5fb84555b3cc2
parent b4f7316a4cdf5ee2b43118aa6133a84a7ae4a5df
Author: f0x52 <f0x@cthu.lu>
Date: Tue, 8 Nov 2022 20:50:37 +0100
[frontend] fix conflict introduced by merge (#1007)
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/source/settings/admin/settings.js b/web/source/settings/admin/settings.js
@@ -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() {