From af30a29596ce0e582c0dd293e79a3bb180f33ff2 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Sun, 27 Oct 2019 21:09:41 +0300
Subject: [PATCH] resolved conflicts in submodule

---
 libdap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdap b/libdap
index 75d8e218..de3c5a89 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 75d8e2187d9793c8c94b444a1434e40e485c083f
+Subproject commit de3c5a89e508f3f90920f8b205c5507f3bc4714e
-- 
GitLab