Resolved merge conflicts (call with friends)

2023-05-04 00:12:04 +02:00 · 2023-05-04 00:12:04 +02:00 · 46109ac4ff
commit 46109ac4ff
parent ff77227ea8 6bcc4ce4c4
31 changed files with 1011 additions and 205 deletions
--- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt
@ -4,7 +4,7 @@ class FunctionalCustomTimer(studyTime: Int) : FunctionalTimer(studyTime) {

    override fun tick() {
        if (!hasEnded()) {
-            time++
+            time--
            totalStudyTime++
        }
    }