Fix: merge conflict resolution

shiksha-platform · Aug 30, 2022 · f6fe04f · f6fe04f
1 parent 95bbfe6
commit f6fe04f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/common-lib/src/index.tsx b/packages/common-lib/src/index.tsx
@@ -23,17 +23,13 @@ import * as questionRegistryService from './services/questionRegistryService'
 import * as likeRegistryService from './services/likeRegistryService'
 import * as commentRegistryService from './services/commentRegistryService'
 import * as assessmentRegistryService from './services/assessmentRegistryService'
-<<<<<<< HEAD
 import * as templateRegistryService from './services/templateRegistryService'
-=======
 import * as contentPagesRegistryService from './services/contentPagesRegistryService'
 import { getApiConfig } from './services/configApiRegistryService'
->>>>>>> 72c3ad3 (changes temp components)
 import * as notificationRegistryService from './services/notificationRegistryService'
 import * as roleRegistryService from './services/roleRegistryService'
 import * as mentorRegisteryService from './services/mentorRegisteryService'
 import * as schoolRegisteryService from './services/schoolRegisteryService'
-import { getApiConfig } from './services/configApiRegistryService'
 import {
   getAllForUser,
   sendReadReceipt