[pktools] 302/375: conflict resolved in CostFactory.h

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit ecf8a70b5715f58a2d9c3518b0e07177dbd5db2e
Merge: e443eb9 6ee9910
Author: Pieter Kempeneers <pieter.kempeneers at vito.be>
Date:   Wed Jul 2 10:52:03 2014 +0200

    conflict resolved in CostFactory.h

 src/algorithms/CostFactory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git