From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 25 Nov 2016 11:23:26 +0100
Subject: Merge from master into 4.next

Done with git merge --squash -x theirs master
---
 test/confs/2190 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 test/confs/2190

(limited to 'test/confs/2190')

diff --git a/test/confs/2190 b/test/confs/2190
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/2190
@@ -0,0 +1 @@
+0900
\ No newline at end of file
-- 
cgit v1.2.3