Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	app/src/main/java/shanmukha/in/sickle_cell/Model/PojoFlag.java
#	app/src/main/java/shanmukha/in/sickle_cell/Model/PojoParameters.java
#	app/src/main/java/shanmukha/in/sickle_cell/UI/SplashScreen.java

...

This commit is contained in:

Ramandeep

2022-01-28 00:30:44 +05:30

parent bb1746219e 0726881045

commit b87b1220c5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available