Fixed strange merge artifacts

diff --git a/console.c b/console.c
index 247bf7381993e220de9951aeeed2a9ef3caf88b6..6fd92ea02873165988c8c4a1ec4ba338ed9f75f4 100644 (file)
--- a/console.c
+++ b/console.c
@@ -2082,7 +2082,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
                                lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
                                lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
                                dpsnprintf(desc, sizeof(desc), "BSPHL");
-<<<<<<< HEAD
                        }
                        else if (!memcmp(buf, "BSP2", 4))
                        {
@@ -2094,7 +2093,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
                        {
                                lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
                                lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
-=======
                        }
                        else if (!memcmp(buf, "BSP2", 4))
                        {
@@ -2106,7 +2104,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
                        {
                                lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES);
                                lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
->>>>>>> origin/divVerent/lhnet_tcp
                                dpsnprintf(desc, sizeof(desc), "BSP2RMQe");
                        }
                        else

diff --git a/lhnet.h b/lhnet.h
index 4dd25cce42d98c72637cb5e80ff95fdbc88ee2c8..069188ebda8a379ca800b79fa96d9707d8ce8fde 100644 (file)
--- a/lhnet.h
+++ b/lhnet.h
@@ -40,18 +40,15 @@ lhnetsocket_t;
 
 void LHNET_Init(void); // must be called before any other threads got spawned
 void LHNET_Shutdown(void);
-<<<<<<< HEAD
 int LHNET_DefaultDSCP(int dscp); // < 0: query; >= 0: set (returns previous value)
 void LHNET_SleepUntilPacket_Microseconds(int microseconds);
 lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address);
 void LHNET_CloseSocket(lhnetsocket_t *lhnetsocket);
-=======
 int LHNET_DefaultDSCP(int dscp); // < 0: query; >= 0: set (returns previous value); NOT thread-safe but usually does not matter (lhnet_default_dscp)
 void LHNET_SleepUntilPacket_Microseconds(int microseconds); // must only be used from the main thread
 lhnetsocket_t *LHNET_OpenSocket(lhnetaddress_t *address, lhnetaddress_t *peeraddress, int use_tcp, int use_blocking, int register_for_select); // thread-safe ONLY if register_for_select is false (socketlist)
 lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address); // NOT thread-safe! (socketlist)
 void LHNET_CloseSocket(lhnetsocket_t *lhnetsocket); // thread-safe ONLY when the socket was created with register_for_select being false (socketlist)
->>>>>>> origin/divVerent/lhnet_tcp
 lhnetaddress_t *LHNET_AddressFromSocket(lhnetsocket_t *sock);
 int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength, lhnetaddress_t *address);
 int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentlength, const lhnetaddress_t *address);