resolve merge conflict

2024-01-06 16:49:41 +05:30
parent 8fb504098f 039e17a3b8
commit 3f47213d95
16 changed files with 1042 additions and 189 deletions
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -253,6 +253,7 @@
    <string name="sample_started">Sample Started</string>
    <string name="buffer_completed">Buffer Completed</string>
    <string name="buffer_started">Buffer Started</string>
+    <string name="power_bank">Connect with Power Bank</string>
    <string name="start">Start</string>
    <string name="place_sample">Place Sample</string>
    <string name="invalid">Invalid</string>