aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2016-06-24 10:36:59 +0200
committerFredrik Thulin <fredrik@thulin.net>2016-06-24 10:36:59 +0200
commit2c5fe8b063388803b31e97f051e7675d992efe58 (patch)
treed5383a731e0fce66f814820cfed4d9d52b8a38b6 /.gitmodules
parentf66d4bcf968eea325932bc948b1c6b181fabc7ee (diff)
The masterkey stuff was accidentally committed to master in libhal (by me)
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 898dc58..d3946e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
[submodule "libhal"]
path = libraries/libhal
url = git@git.cryptech.is:sw/libhal.git
- branch = ft-ks_flash
[submodule "thirdparty/libtfm"]
path = libraries/thirdparty/libtfm
url = git@git.cryptech.is:sw/thirdparty/libtfm.git