[openscreenprotocol] new commits pushed by mfoltzgoogle

The following commits were just pushed by mfoltzgoogle to https://github.com/webscreens/openscreenprotocol:

* Add conflict resolution requirement
  by mark a. foltz
https://github.com/webscreens/openscreenprotocol/commit/9ffc015d301e85bf25b6c16879c86ff659a4d6ed

Received on Monday, 19 August 2019 20:09:14 UTC