]> gitweb.factorcode.org Git - factor.git/commitdiff
Fix conflict
authorSlava Pestov <slava@oberon.internal.stack-effects.com>
Fri, 8 Feb 2008 00:57:23 +0000 (18:57 -0600)
committerSlava Pestov <slava@oberon.internal.stack-effects.com>
Fri, 8 Feb 2008 00:57:23 +0000 (18:57 -0600)
1  2 
extra/project-euler/032/032.factor

index b8b0758974e396fd02ee209dab2d45e97246f8bc,e03ab6f89b7c1744aea6898c768243b92c274a06..0981c68e1c1522ebbd01a2115492893add6d21c9
mode 100755,100644..100755