From ad08c6c22987d31d9ead0429aae5fb84555b3cc2 Mon Sep 17 00:00:00 2001 From: f0x52 Date: Tue, 8 Nov 2022 20:50:37 +0100 Subject: [PATCH] [frontend] fix conflict introduced by merge (#1007) --- web/source/settings/admin/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/source/settings/admin/settings.js b/web/source/settings/admin/settings.js index 88f32624a..ae9207f36 100644 --- 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() {