fix Merge conflict.

This commit is contained in:
Ahmed Bouhuolia
2020-03-26 14:02:52 +02:00
parent ae29d20cc9
commit 6fd1afaba7
25 changed files with 923 additions and 454 deletions

View File

@@ -91,4 +91,4 @@ export default compose(
ResourceConnect,
ItemsConnect,
CustomViewsConnect,
)(ItemsList);
)(ItemsList);