]> gitweb.factorcode.org Git - factor.git/commit
conflict resolution
authorJose A. Ortega Ruiz <jao@gnu.org>
Thu, 18 Dec 2008 23:26:39 +0000 (00:26 +0100)
committerJose A. Ortega Ruiz <jao@gnu.org>
Thu, 18 Dec 2008 23:26:39 +0000 (00:26 +0100)
commit149cb7f7b822ed9fbd5423cb139464646d053ce3
tree7c52d7134aee885377867a998632a140389b003e
parentad87aa736dbb7347e4b1ee85e673701138ef4e53
parentb11cbaa3af8c91ecff1c24a4a2b247da73a9476f
conflict resolution
extra/fuel/fuel.factor