Fixed merge errors

Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
MacPass · Oct 23, 2015 · e6ae520 · e6ae520
1 parent 091d7f8
commit e6ae520
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/DDHotKey b/DDHotKey
diff --git a/HNHUi b/HNHUi
diff --git a/KeePassKit b/KeePassKit