Add note about conflict list
authorDave Rolsky <autarch@urth.org>
Mon, 15 Sep 2008 20:19:05 +0000 (20:19 +0000)
committerDave Rolsky <autarch@urth.org>
Mon, 15 Sep 2008 20:19:05 +0000 (20:19 +0000)
commit1bb961da8dc74707e47e8c24a7d8b0771738b797
treecc59a383ae3cf995c10c641a9a49474e9b09e88c
parent7aaa200491c983dade90107e0f215ae1144367a8
Add note about conflict list
Changes