# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1489990837 -3600
# Node ID 061dcecdcd1e53f82b33052b489f22ad04b06e0a
# Parent  3360705cfae73af9efea8512683eb67597b69605# Parent  bf2801b1866439645bca71e10f37faadf702e69b
resolved merge conflict

diff -r 3360705cfae7 -r 061dcecdcd1e net-im/psi-plus/Manifest