diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-11-12 16:51:29 +0100 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-11-12 16:51:29 +0100 |
commit | a5a6caaa824637a6e9dace315d1cd7d2e4548001 (patch) | |
tree | 2c9ab016318006bdb27c04c8809d1231d07bf321 /.gitmodules | |
parent | c084316669ff70f34fef3a2e054982693d539edd (diff) | |
parent | a768908b5e84052918106c1352a2edb92039d3c3 (diff) | |
download | vyos-build-a5a6caaa824637a6e9dace315d1cd7d2e4548001.tar.gz vyos-build-a5a6caaa824637a6e9dace315d1cd7d2e4548001.zip |
Merge branch 'crux' of github.com:vyos/vyos-build into crux
Conflicts:
data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index f0c9ea46..a6c4072e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,9 +103,6 @@ [submodule "packages/vyos-nhrp"] path = packages/vyos-nhrp url = https://github.com/vyos/vyos-nhrp.git -[submodule "packages/vyos-igmpproxy"] - path = packages/vyos-igmpproxy - url = https://github.com/vyos/vyos-igmpproxy.git [submodule "packages/vyatta-util"] path = packages/vyatta-util url = https://github.com/vyos/vyatta-util.git |