From 367c6280df46d29b8785c48d3e6f61d62853ad49 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Wed, 9 Nov 2016 13:43:24 +0100
Subject: [PATCH] post-merge fix

---
 .../midpoint/web/page/admin/users/PageMergeObjects.java       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
index c41c7fb1027..ca826f83f53 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
@@ -174,10 +174,6 @@ protected boolean isPreviewButtonVisible(){
                 return false;
             }
 
-            @Override
-            protected boolean getOptionsPanelVisibility() {
-                return false;
-            }
         };
     }
     @Override