From bc904e525143a19b73b5ab0ecf4cb138320386b9 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Wed, 4 Dec 2019 21:50:13 +0300
Subject: [PATCH] Local merges and conflicts resolved

---
 libdap-chain-net-srv           | 2 +-
 libdap-client                  | 2 +-
 libdap-stream-ch               | 2 +-
 libdap-stream-ch-chain-net-srv | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv
index 04e23e076..620d2eff0 160000
--- a/libdap-chain-net-srv
+++ b/libdap-chain-net-srv
@@ -1 +1 @@
-Subproject commit 04e23e07662555083adf19059732bf9768e28f6e
+Subproject commit 620d2eff0406ff4202d5bfb7b79c2ce3752bad84
diff --git a/libdap-client b/libdap-client
index 8186a9c5d..1ae33a382 160000
--- a/libdap-client
+++ b/libdap-client
@@ -1 +1 @@
-Subproject commit 8186a9c5d8e45a39b8e91a41e2cf668e7189d612
+Subproject commit 1ae33a38297c2c9aa77a691ff0b642d2650199d3
diff --git a/libdap-stream-ch b/libdap-stream-ch
index 270768f0b..84e0d96f6 160000
--- a/libdap-stream-ch
+++ b/libdap-stream-ch
@@ -1 +1 @@
-Subproject commit 270768f0b85a96eba3578bd0ffe3cf25ac76dc5a
+Subproject commit 84e0d96f6301339572b62c363b5d46feab354521
diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv
index 68ebab00a..0c96cf2c1 160000
--- a/libdap-stream-ch-chain-net-srv
+++ b/libdap-stream-ch-chain-net-srv
@@ -1 +1 @@
-Subproject commit 68ebab00ae1544c4854c3c919472dab935b856fc
+Subproject commit 0c96cf2c10c9d2812a90d4bb7d45ba721c602e87
-- 
GitLab