[Pkg-cli-apps-commits] [fsharp] 67/71: resolve merge conflict

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit 3381671782b019f7f210dc24c630b9d076c8efea
Merge: 74cc980 28d685f
Author: Don Syme <donsyme at fastmail.fm>
Date:   Fri Dec 27 11:23:57 2013 +0100

    resolve merge conflict


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git