opensrp / opensrp-client-brac-mhealth

Other

0 stars 0 forks source link

Merge branch 'production_sk' of https://github.com/OpenSRP/opensrp-cl… #42

Closed mahmud6390 closed 3 years ago

mahmud6390 commented 3 years ago

…ient-brac-mhealth into guest_member

Conflicts:

opensrp-brac-hnpp/src/main/AndroidManifest.xml

opensrp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/activity/FamilyRegisterActivity.java

opensrp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/job/HnppJobCreator.java

opensrp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/repository/HnppChwRepository.java

opensrp-brac-hnpp/src/main/res/values/strings.xml