From 9f28c32da5afcb87d378cfc9f3bf2d794ee0af8e Mon Sep 17 00:00:00 2001 From: Ari Johnson Date: Fri, 22 May 2009 15:04:49 +0000 Subject: [PATCH] Conflict fix --- hdrs/lock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.30.2