From: Victor Wagner <vitus@wagner.pp.ru>
Date: Thu, 12 Sep 2019 06:17:50 +0000 (+0300)
Subject: Fix conflict which arises from editing example conf without updating working copy... 
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=65240923f667eeb18fb688c4591ca22495491d90;p=oss%2Fdyngo.git

Fix conflict which arises from editing example conf without updating working copy first
---

65240923f667eeb18fb688c4591ca22495491d90