[nautilus/gnome-3-20] conflict-dialog: style fix

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit f3919f4cb6a846e911f7c46a94e74a73ed3c112a
Author: Carlos Soriano <csoriano gnome org>
Date:   Tue Mar 1 17:34:16 2016 +0100

    conflict-dialog: style fix

 .../nautilus-file-conflict-dialog.c                |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c 
b/libnautilus-private/nautilus-file-conflict-dialog.c
index 9b7cbca..2f8791d 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -653,8 +653,7 @@ nautilus_file_conflict_dialog_new (GtkWindow *parent,
                                                   "modal", TRUE,
                                                   "title", dest_is_dir ? _("Merge Folder") : _("File and 
Folder conflict"),
                                                   NULL));
-       }
-       else {
+       } else {
                dialog = GTK_WIDGET (g_object_new (NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,
                                                   "use-header-bar", TRUE,
                                                   "modal", TRUE,