]> gitweb.factorcode.org Git - factor.git/commit
Conflict resolution
authorJose A. Ortega Ruiz <jao@gnu.org>
Thu, 18 Dec 2008 23:24:23 +0000 (00:24 +0100)
committerJose A. Ortega Ruiz <jao@gnu.org>
Thu, 18 Dec 2008 23:24:23 +0000 (00:24 +0100)
commitad87aa736dbb7347e4b1ee85e673701138ef4e53
tree33500b1f479aa4af65ce828e3cf42b3bc15571c8
parent35039d01498824be1ad39bcd7cf704920bbd779e
parentcfca27ba5fad7f19ca1f2b4c3965385f4ee56f89
Conflict resolution
extra/fuel/fuel.factor