Resolve merge conflict: Remove src/locales/en.json
This commit is contained in:
commit
a0920f93a0
6 files changed
+2219
-976
No files matched your search
@@ -29,8 +29,8 @@ const Dialog = ({
|
||||
justifyContent="flex-end"
|
||||
>
|
||||
<Button
|
||||
variant="text"
|
||||
color="info"
|
||||
variant="contained"
|
||||
color="secondary"
|
||||
onClick={onCancel}
|
||||
>
|
||||
Cancel
|
||||
|
||||
Reference in new issue
Block a user