From 2bbc0c6ae6f3fca258bce56832e8490d4f805ee2 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Wed, 8 Apr 2020 21:58:02 +0200
Subject: [PATCH] Fix error of merge master

---
 src/components/rooms.js | 8 +++++++-
 src/components/users.js | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/rooms.js b/src/components/rooms.js
index 34b7f3e..d80e0c0 100644
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -1,5 +1,11 @@
 import React, { Fragment } from "react";
-import { Datagrid, List, TextField, BulkDeleteButton, Pagination } from "react-admin";
+import {
+  Datagrid,
+  List,
+  TextField,
+  BulkDeleteButton,
+  Pagination,
+} from "react-admin";
 
 const RoomBulkActionButtons = props => (
   <Fragment>
diff --git a/src/components/users.js b/src/components/users.js
index 918a455..5e4bddc 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -47,7 +47,7 @@ const UserFilter = props => (
 );
 
 const UserEditToolbar = props => (
-  <Toolbar {...props} >
+  <Toolbar {...props}>
     <SaveButton submitOnEnter={true} />
     <DeleteButton
       label="resources.users.action.deactivate"
@@ -133,7 +133,7 @@ export const UserCreate = props => (
 
 export const UserEdit = props => (
   <Edit {...props}>
-    <TabbedForm toolbar={<UserEditToolbar>
+    <TabbedForm toolbar={<UserEditToolbar />}>
       <FormTab label="resources.users.name" icon={<PersonPinIcon />}>
         <TextInput source="id" disabled />
         <TextInput source="displayname" />