Fixed merge errors

Browse Source

Signed-off-by: michael starke <michael.starke@hicknhack-software.com>

...

This commit is contained in:

michael starke

2015-10-13 18:29:36 +02:00

parent 091d7f83b3

commit e6ae520ba5

3 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

DDHotKey

Submodule DDHotKey updated: e6846463e2...dfab50eb22

2

HNHUi

Submodule HNHUi updated: 108f4519a5...3fecc574c1

2

KeePassKit

Submodule KeePassKit updated: 870d252a29...ad2b8a13db