feat(#9237): add functionality of getting people with pagination in c…

…ht-datasource (#9266)
medic · Aug 12, 2024 · bf70789 · bf70789
1 parent 8437a71
commit bf70789
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/shared-libs/cht-datasource/src/person.ts b/shared-libs/cht-datasource/src/person.ts
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 import { ContactTypeQualifier, isContactTypeQualifier, isUuidQualifier, UuidQualifier } from './qualifier';
 import { adapt, assertDataContext, DataContext, getDocumentStream } from './libs/data-context';
+=======
+import { isContactTypeQualifier, isUuidQualifier, ContactTypeQualifier, UuidQualifier } from './qualifier';
+import { adapt, assertDataContext, DataContext } from './libs/data-context';
+>>>>>>> b20dc2297 (feat(#9237): add functionality of getting people with pagination in cht-datasource (#9266))
 import { Contact, NormalizedParent } from './libs/contact';
 import * as Remote from './remote';
 import * as Local from './local';