]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
projects / tahoe-lafs / tahoe-lafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dd4ad3d) | patch
fix purely syntactic merge conflict
authorZooko O'Whielacronx <zooko@zooko.com>
Thu, 1 Feb 2007 23:07:07 +0000 (16:07 -0700)
committerZooko O'Whielacronx <zooko@zooko.com>
Thu, 1 Feb 2007 23:07:07 +0000 (16:07 -0700)
commit82a0cd661524d04dd498ce80842369536520205e
tree478cde91fc61c51240215192d22f89f9b5f3a46ftree | snapshot
parentdd4ad3d542ed0dc0bf8ab31280776ae079eba1c2commit | diff
fix purely syntactic merge conflict
Makefile diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.