Convert to kt

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.kt

@@ -61,7 +61,7 @@ class ConflictsResolveDialog : DialogFragment(), Injectable {
         CANCEL,
         KEEP_BOTH,
         KEEP_LOCAL,
-        KEEP_SERVER,
+        KEEP_SERVER
     }
 
     override fun onAttach(context: Context) {
@@ -142,7 +142,6 @@ class ConflictsResolveDialog : DialogFragment(), Injectable {
             }
             .setTitle(String.format(getString(R.string.conflict_file_headline), existingFile?.fileName))
 
-
         setupUI()
         setOnClickListeners()