diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:47:24 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:47:24 +0200 |
| commit | d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82 (patch) | |
| tree | 19c5a60504e8c2f7488f66d32c5dc3e617ae55fc /.gitmodules | |
| parent | 69c38c3f340786fd3e3fe755d2cff6bbb27823e6 (diff) | |
| parent | 306bea5ee95576cd5428fe9ab9289fe428a86c6e (diff) | |
| download | open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.tar.gz open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.tar.bz2 open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index fc75dde7f..93ca9d49b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "extern/minidns"] path = extern/minidns url = https://github.com/open-keychain/minidns.git -[submodule "OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell"] - path = OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell - url = https://github.com/singpolyma/OpenPGP-Haskell.git [submodule "extern/openpgp-card-nfc-lib"] path = extern/openpgp-card-nfc-lib - url = https://github.com/open-keychain/openpgp-card-nfc-lib.git + url = https://github.com/open-keychain/openpgp-card-nfc-lib.git
\ No newline at end of file |