fixed some collisions with older commits

[ircu2.10.12-pk.git] / include / s_user.h

diff --git a/include/s_user.h b/include/s_user.h
index 78035035da577ef33e271961781d71592f054d9c..970e45bc358c517326c424a21d456bf0f3ed3806 100644 (file)
--- a/include/s_user.h
+++ b/include/s_user.h
@@ -75,8 +75,6 @@ extern int set_nick_name(struct Client* cptr, struct Client* sptr,
                          const char* nick, int parc, char* parv[], unsigned int force);
 extern void send_umode_out(struct Client* cptr, struct Client* sptr,
                           struct Flags* old, int prop);
-extern void send_umode(struct Client *cptr, struct Client *sptr, struct Flags *old,
-                       int sendset);
 extern int whisper(struct Client* source, const char* nick,
                    const char* channel, const char* text, int is_notice);
 extern void send_user_info(struct Client* to, char* names, int rpl,