]> git.neil.brown.name Git - history.git/commit
Hand resolve of minor conflicts.
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Oct 2002 11:08:04 +0000 (04:08 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Oct 2002 11:08:04 +0000 (04:08 -0700)
commit764d1bce30488331463e6ab11d4b9da161ddf124
tree0837c45446d5ff84eb3267cfef9c9310273a9b6b
parenta9d077d89563df53032c72009ccc4397b7ab4663
parent339d35f78bf95e5ccaf320caa5375037709957fa
Hand resolve of minor conflicts.