diff bin/git-conflict @ 10:11ee5ef5fd28

Fix bad pryrc
author zegervdv <zegervdv@me.com>
date Mon, 03 Mar 2014 11:00:53 +0100
parents d35280c9b023
children faf7781dae42
line wrap: on
line diff