--- deliantra/server/include/libproto.h	2006/09/04 11:07:59	1.10
+++ deliantra/server/include/libproto.h	2006/09/04 16:46:32	1.11
@@ -185,7 +185,6 @@
 extern void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags);
 extern int on_same_map(const object *op1, const object *op2);
 /* object.c */
-extern int CAN_MERGE(object *ob1, object *ob2);
 extern signed long sum_weight(object *op);
 extern object *object_get_env_recursive(object *op);
 extern object *is_player_inv(object *op);