diff options
author | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
---|---|---|
committer | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
commit | ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a (patch) | |
tree | 4a66b774bf493e95fc2961236de0ee84b4646362 /hurd.mdwn | |
parent | 42dc7198bbea79f4abe15d40804f539ffed1b05b (diff) | |
parent | 2e315ef11db39e8ee0a0decc054801521ee049dd (diff) |
fix merge conflict
Diffstat (limited to 'hurd.mdwn')
-rw-r--r-- | hurd.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -90,9 +90,9 @@ in the *unstable* branch of the Debian archive. * [[libports]] * [[libstore]] * [[libchannel]] - * [[libhello_example]] -- Hurd library example * [[libtrivfs]] * [[libnetfs]] -- short introductory material + * [[libdiskfs]] * [[libihash]] * [[libpthread]] * [[IO_Path]] |