Fix merge of git modules
author Alexander Sadleir
()
committer Alexander Sadleir
()
commit 2b2df304c31558a9dccdd855f097870c743ab942
tree ded928a1bc9839ba9e5d948b559d69d7b0626d8e
parent 4aab11cb185fdfa17409d8512b881d5d6e9c9093
Fix merge of git modules
.gitmodules