#36 Feature: Live update Active sleep time

maityamit / Sleepometer-Android-App

Sleepometer Android App , measure your sleep and track. This will basically measure your sleep, and represent the overall day-wise sleep hours and the last 7 days' average sleep also can measure.

https://play.google.com/store/apps/details?id=sleepometerbyamitmaity.example.sleepometer

MIT License

27 stars 41 forks source link

#36 Feature: Live update Active sleep time #37

Closed kuldeepsingh0330 closed 1 year ago

kuldeepsingh0330 commented 1 year ago

https://user-images.githubusercontent.com/95225751/206555085-c63d8203-d7b4-45cb-b93a-663ac559cf6c.mp4

maityamit commented 1 year ago

fix merge conflicts @kuldeepsingh0330

kuldeepsingh0330 commented 1 year ago

how can i fix this merge conflict. Can you tell what issue you face.