From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Mon, 18 Apr 2016 15:49:31 +0000 (+0200)
Subject: Fixed merge problems.
X-Git-Tag: v3.1~140^2~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2bfc8411cbffa4199cdb991316370df9d32fd726;hp=2bfc8411cbffa4199cdb991316370df9d32fd726;p=osm%2Fvim-emu.git

Fixed merge problems.
---