Resolve conflict

2020-07-03 16:58:23 +03:00
parent 2d5287fcf3 21dfb5ffe8
commit c12309a1b2
114 changed files with 4241 additions and 1444 deletions
--- a/client/src/components/Settings/Dns/Access/Form.js
+++ b/client/src/components/Settings/Dns/Access/Form.js
@@ -46,7 +46,7 @@ const Form = (props) => {
            type="text"
            className="form-control form-control--textarea font-monospace"
            disabled={disabled}
-            normalizeOnBlur={normalizeMultiline}
+            normalizeOnBlur={id === 'disallowed_clients' ? normalizeMultiline : undefined}
        />
    </div>;