Skip to content
Snippets Groups Projects
Commit 32dac4e7 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Fix a broken merge.

parent 2ceeacac
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
.gitmodules
+ 4
− 0
View file @ 32dac4e7
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
url = https://github.com/tarantool/luajit.git url = https://github.com/tarantool/luajit.git
ignore = dirty ignore = dirty
branch = tarantool-1.7 branch = tarantool-1.7
[submodule "third_party/libyaml"]
path = third_party/libyaml
url = https://github.com/tarantool/libyaml.git
ignore = dirty
[submodule "src/lib/msgpuck"] [submodule "src/lib/msgpuck"]
path = src/lib/msgpuck path = src/lib/msgpuck
url = https://github.com/tarantool/msgpuck.git url = https://github.com/tarantool/msgpuck.git
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment