From: Ari Johnson <ari@theari.com>
Date: Fri, 22 May 2009 15:04:49 +0000 (+0000)
Subject: Conflict fix
X-Git-Tag: 0.73p2~19
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=9f28c32da5afcb87d378cfc9f3bf2d794ee0af8e;p=cobramush.git

Conflict fix
---

diff --git a/hdrs/lock.h b/hdrs/lock.h
index 238b865..494c660 100644
--- a/hdrs/lock.h
+++ b/hdrs/lock.h
@@ -109,7 +109,7 @@ extern const lock_type Dropto_Lock;	/* Who follows the dropto of this room? */
 extern const lock_type Destroy_Lock;	/* Who can @dest me if I'm dest_ok? */
 extern const lock_type Interact_Lock;
 extern const lock_type MailForward_Lock;	/* Who can forward mail to me */
-extern const lock_type Take_Lock;
+extern const lock_type Take_Lock;	/* Who can take from the contents of this object? */
 /* channel locks */
 #ifdef  NEWCHAT
 extern const lock_type chan_speak_lock;