Merge branch 'dev' into 'dev-check-apk-update'
# Conflicts: # app/build.gradle # app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt # app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt # app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt # build.gradle # gradle/wrapper/gradle-wrapper.properties
This commit is contained in:
@@ -17,4 +17,4 @@
|
||||
android:icon="@drawable/baseline_settings_24"
|
||||
android:title="@string/menu_settings" />
|
||||
</group>
|
||||
</menu>
|
||||
</menu>
|
||||
|
||||
Reference in New Issue
Block a user