From f39086c0800ffcc81e03a49a364b32c97e528abd Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Wed, 19 Oct 2016 18:24:09 +0200
Subject: [PATCH] fixed merge error

---
 MacPass/MPEntryViewController.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 8e68ad2c..c626601b 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -344,8 +344,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
                                        NSStringFromSelector(@selector(objectValue)),
                                        NSStringFromSelector(@selector(history))];
       [view.textField bind:NSValueBinding toObject:view withKeyPath:historyCountKeyPath options:nil];
-    else if(isIndexColumn) {
     }
+    else if(isIndexColumn) {
       view.textField.stringValue = @"";
     }
   }