added info on conflicts
authorewt <devnull@localhost>
Thu, 30 Jan 1997 15:54:59 +0000 (15:54 +0000)
committerewt <devnull@localhost>
Thu, 30 Jan 1997 15:54:59 +0000 (15:54 +0000)
commit7bc74ba4aa4529d9683986493e2da1cb9cd354f9
tree302ecdfa2fb396477af44b5e134a20b8be6e3f80
parentfb25acc6f607a72b8ef9d41c71de77dcf0c6b5d0
added info on conflicts

CVS patchset: 1377
CVS date: 1997/01/30 15:54:59
docs/dependencies