kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 20:24:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

lint fix and coverage test fix

Browse Source 
Fixed conflict
This commit is contained in:
Gouri Panda 2022-12-25 23:36:29 +05:30 committed by Kelson
parent 80ed18ed4c
commit 873f2fd5a0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/test/java/org/kiwix/kiwixmobile/core/dao/NewRecentSearchDaoTest.kt
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package org.kiwix.kiwixmobile.core.dao
=======
package org.kiwix.kiwixmobile.core.dao /*
>>>>>>> 3e20ea895 (lint fix and coverage test fix)
// * Kiwix Android
// * Copyright (c) 2020 Kiwix <android.kiwix.org>
// * This program is free software: you can redistribute it and/or modify

4
core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/SaveSearchToRecentsTest.kt
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package org.kiwix.kiwixmobile.core.search.viewmodel.effects
=======
package org.kiwix.kiwixmobile.core.search.viewmodel.effects /*
>>>>>>> 3e20ea895 (lint fix and coverage test fix)
// * Kiwix Android
// * Copyright (c) 2020 Kiwix <android.kiwix.org>
// * This program is free software: you can redistribute it and/or modify