Skip to content

Commit 11973d6

Browse files
Merge pull request #12172 from nextcloud/refactor/convert-ConflictsResolveActivity-to-kt
Convert ConflictsResolveActivity to Kotlin
2 parents 0dcdc6a + 6576f79 commit 11973d6

File tree

2 files changed

+249
-257
lines changed

2 files changed

+249
-257
lines changed

app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

Lines changed: 0 additions & 257 deletions
This file was deleted.

0 commit comments

Comments
 (0)