merge with develop

src/index.js

@@ -1,13 +1,25 @@
+import React from 'react';
+import { FormattedMessage } from '@openimis/fe-core';
 import messagesEn from './translations/en.json';
 import DeduplicationFieldSelectionDialog from './components/dialogs/DeduplicationFieldSelectionDialog';
 import reducer from './reducer';
+import {
+  DeduplicationResolutionItemFormatters,
+  DeduplicationResolutionTaskTableHeaders,
+} from './components/tasks/DeduplicationResolutionTask';
 
 const DEFAULT_CONFIG = {
   translations: [{ key: 'en', messages: messagesEn }],
   reducers: [{ key: 'deduplication', reducer }],
   'deduplication.deduplicationFieldSelectionDialog': [
     DeduplicationFieldSelectionDialog,
   ],
+  'tasksManagement.tasks': [{
+    text: <FormattedMessage module="deduplication" id="tasks.deduplication.title" />,
+    tableHeaders: DeduplicationResolutionTaskTableHeaders,
+    itemFormatters: DeduplicationResolutionItemFormatters,
+    taskSource: ['CreateDeduplicationReviewTasksService'],
+  }],
 };
 
 // eslint-disable-next-line import/prefer-default-export

src/translations/en.json

@@ -9,11 +9,7 @@
     "deduplication.deduplicate.button.createDeduplicationReviewTask": "Create Deduplication Review Tasks",
     "deduplication.deduplicationSummaryTable.group": "Group",
     "deduplication.deduplicationSummaryTable.duplicates": "Duplicates",
-<<<<<<< Updated upstream
-    "deduplication.deduplicate.mutation.createTasks": "Deduplication tasks have been created."
-=======
     "deduplication.tasks.deduplication.title": "Benefit Plan Deduplication Task",
     "deduplication.deduplicate.mutation.createTasks": "Deduplication tasks have been created.",
     "deduplication.BeneficiaryDuplicatesTable.checkbox.header": "Select all columns"
->>>>>>> Stashed changes
 }