[commits] ActiveSync branch FRAMEWORK_5_2 updated. 7e7dc71be9930abf8e54496885b40b958f958af6

[Michael J. Rubinsky]

The branch "FRAMEWORK_5_2" has been updated.
The following is a summary of the commits.

from: 0055aa1c2e664a31a382937f98116a4873db148b

7e7dc71 Fix merge artifacts.

Summary: https://github.com/horde/ActiveSync/compare/0055aa1c2e66...7e7dc71be993

-----------------------------------------------------------------------

commit 7e7dc71be9930abf8e54496885b40b958f958af6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun, 12 Nov 2017 18:54:07 -0500

Fix merge artifacts.

 M package.xml

https://github.com/horde/ActiveSync/commit/7e7dc71be9930abf8e54496885b40b958f958af6