Merge remote-tracking branch 'origin/#20-implement-malaria-follo-up-v… · opensrp/opensrp-client-chw-malaria@009e9ce · GitHub

Commit

Merge remote-tracking branch 'origin/#20-implement-malaria-follo-up-v…

Browse files

…isit' into #20-implement-malaria-follo-up-visit

# Conflicts:
#	opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/activity/BaseMalariaProfileActivity.java
#	opensrp-chw-malaria/src/main/java/org/smartregister/chw/malaria/presenter/BaseMalariaProfilePresenter.java
#	opensrp-chw-malaria/src/test/java/org/smartregister/presenter/BaseMalariaProfilePresenterTest.java

Loading branch information

whoisladleo committed Jul 2, 2019

2 parents ba4cf49 + 53d7e11 commit 009e9ce