From 32dac4e79e67bcded8907af2388943d7faa60642 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 4 Jul 2016 21:01:17 +0300
Subject: [PATCH] Fix a broken merge.

---
 .gitmodules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 04a7ce2324..8b181c16d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,6 +3,10 @@
 	url = https://github.com/tarantool/luajit.git
 	ignore = dirty
 	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"]
 	path = src/lib/msgpuck
 	url = https://github.com/tarantool/msgpuck.git
-- 
GitLab