diff bin/git-conflict @ 241:5fb4bf06d46d

Fix coffeescript plugin loading
author zegervdv <zegervdv@me.com>
date Mon, 16 Feb 2015 10:54:29 +0100
parents faf7781dae42
children
line wrap: on
line diff