diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 10:03:46 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 10:03:46 +0100 |
commit | 382158d87b170e2b1848928c745073c209ac64f3 (patch) | |
tree | 51ebd32d3bfe74dc5e8058d684bba6f9782ee996 /.gitmodules | |
parent | 4567512d7a341659bcb19956d58201aeaf0871b5 (diff) | |
download | px4-firmware-382158d87b170e2b1848928c745073c209ac64f3.tar.gz px4-firmware-382158d87b170e2b1848928c745073c209ac64f3.tar.bz2 px4-firmware-382158d87b170e2b1848928c745073c209ac64f3.zip |
fix merge error in .gitmodules
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 577181281..d0039b38d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "Tools/gencpp"] path = Tools/gencpp url = https://github.com/ros/gencpp.git -[submodule "src/lib/uavcan"] - path = src/lib/uavcan - url = git://github.com/pavel-kirienko/uavcan.git |