fixmerge

ygopro-server.coffee

@@ -2094,22 +2094,14 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
             return room_title.match(regexp)
           , room_title)
             log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip)
-<<<<<<< HEAD
-            ygopro.stoc_die(client, "${bad_name_level2}")
-=======
             ygopro.stoc_die(client, "${bad_roomname_level2}")
->>>>>>> mc
             return
           else if _.any(badwords.level1, (badword) ->
             regexp = new RegExp(badword, 'i')
             return room_title.match(regexp)
           , room_title)
             log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip)
-<<<<<<< HEAD
-            ygopro.stoc_die(client, "${bad_name_level1}")
-=======
             ygopro.stoc_die(client, "${bad_roomname_level1}")
->>>>>>> mc
             return
           room = new Room(name, options)
           if room