From e6ae520ba532b5f5b02411f1063e52df48e80bf8 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Tue, 13 Oct 2015 18:29:36 +0200
Subject: [PATCH] Fixed merge errors

Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
---
 DDHotKey   | 2 +-
 HNHUi      | 2 +-
 KeePassKit | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DDHotKey b/DDHotKey
index e6846463..dfab50eb 160000
--- a/DDHotKey
+++ b/DDHotKey
@@ -1 +1 @@
-Subproject commit e6846463e2fedd6742a5f10633e7cc1069555924
+Subproject commit dfab50eb22782850ec836a92d56d16bdb6b5912a
diff --git a/HNHUi b/HNHUi
index 108f4519..3fecc574 160000
--- a/HNHUi
+++ b/HNHUi
@@ -1 +1 @@
-Subproject commit 108f4519a573c26610f7b7f69e72e4405ee420bd
+Subproject commit 3fecc574c1cdd666461981b568a413e6d1930edd
diff --git a/KeePassKit b/KeePassKit
index 870d252a..ad2b8a13 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 870d252a2915a2f00326e85bfecebde26f003dca
+Subproject commit ad2b8a13db9e070c62f81aeb08ea52bb9d78ac04