From: Oliver Kurth <okurth@vmware.com>
Date: Sat, 25 Feb 2017 00:27:17 +0000 (-0800)
Subject: resolve conflict in ReleaseNotes.md
X-Git-Tag: stable-10.1.10~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b1920a4580afe43db40ae9fb49ecb68c9f48d4;p=thirdparty%2Fopen-vm-tools.git

resolve conflict in ReleaseNotes.md
---

d9b1920a4580afe43db40ae9fb49ecb68c9f48d4