From: Sarah Conway <sarah.conway@crunchydata.com>
Date: Wed, 15 Aug 2018 22:04:04 +0000 (-0700)
Subject: merge conflicts
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=e44deba6c24ce07a081ac5056f422f344f919fcc;p=pgopen2018.git

merge conflicts
---

e44deba6c24ce07a081ac5056f422f344f919fcc