]> wagner.pp.ru Git - oss/dyngo.git/commit
Fix conflict which arises from editing example conf without updating working copy...
authorVictor Wagner <vitus@wagner.pp.ru>
Thu, 12 Sep 2019 06:17:50 +0000 (09:17 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Thu, 12 Sep 2019 06:17:50 +0000 (09:17 +0300)
commit65240923f667eeb18fb688c4591ca22495491d90
treed1fe771b19272bf2ac64216a3fd5796fdd67e5bf
parentd3eaa42a7888d9a95f7d64eb528dd8f84b0a777b
parent65034c98c8664e3efdc5074a529f1e1e9df83a5f
Fix conflict which arises from editing example conf without updating working copy first